Eio: fix thread detection

Patch by Maxime Villard and myself

SVN revision: 75644

diff --git a/legacy/eio/m4/efl_threads.m4 b/legacy/eio/m4/efl_threads.m4
index 86394bb..33d15a3 100644 (file)
--- a/legacy/eio/m4/efl_threads.m4
+++ b/legacy/eio/m4/efl_threads.m4
@@ -85,12 +85,12 @@ case "$host_os" in
    mingw*)
       ;;
    solaris*)
-      _efl_thread_cflags="-mt"
-      _efl_thread_libs="-mt"
+      _efl_threads_cflags="-mt"
+      _efl_threads_libs="-mt"
       ;;
    *)
-      _efl_thread_cflags="-pthread"
-      _efl_thread_libs="-pthread"
+      _efl_threads_cflags="-pthread"
+      _efl_threads_libs="-pthread"
       ;;
 esac
 
@@ -127,8 +127,8 @@ fi
 EFL_PTHREAD_CFLAGS=""
 EFL_PTHREAD_LIBS=""
 if test "x${_efl_have_posix_threads}" = "xyes" ; then
-   EFL_PTHREAD_CFLAGS=${_efl_thread_cflags}
-   EFL_PTHREAD_LIBS=${_efl_thread_libs}
+   EFL_PTHREAD_CFLAGS=${_efl_threads_cflags}
+   EFL_PTHREAD_LIBS=${_efl_threads_libs}
 fi
 
 AC_SUBST(EFL_PTHREAD_CFLAGS)

diff --git a/legacy/eio/src/lib/Makefile.am b/legacy/eio/src/lib/Makefile.am
index da53b2a..73d3c23 100644 (file)
--- a/legacy/eio/src/lib/Makefile.am
+++ b/legacy/eio/src/lib/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = @EIO_CFLAGS@ \
+@EFL_PTHREAD_CFLAGS@ \
 @EFL_EIO_BUILD@
 
 lib_LTLIBRARIES = libeio.la
@@ -27,7 +28,7 @@ libeio_la_SOURCES += eio_monitor_win32.c
 endif
 endif
 
-libeio_la_LIBADD = @EIO_LIBS@
+libeio_la_LIBADD = @EIO_LIBS@ @EFL_PTHREAD_LIBS@
 libeio_la_LDFLAGS  = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
 EXTRA_DIST = eio_private.h