summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-08-24 08:19:41 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-08-24 08:19:41 +0000
commit25feacc120fb6029fece09f688fd82ab6fb5564f (patch)
tree36eab665573ac70c3fba0ea9a514043167e7d41b /legacy
parent912fd7ebf21035c3bb7f6a6a793a6925c9bd3a9a (diff)
Eio: fix thread detection
Patch by Maxime Villard and myself SVN revision: 75644
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eio/m4/efl_threads.m412
-rw-r--r--legacy/eio/src/lib/Makefile.am3
2 files changed, 8 insertions, 7 deletions
diff --git a/legacy/eio/m4/efl_threads.m4 b/legacy/eio/m4/efl_threads.m4
index 86394bbddf..33d15a39b4 100644
--- a/legacy/eio/m4/efl_threads.m4
+++ b/legacy/eio/m4/efl_threads.m4
@@ -85,12 +85,12 @@ case "$host_os" in
85 mingw*) 85 mingw*)
86 ;; 86 ;;
87 solaris*) 87 solaris*)
88 _efl_thread_cflags="-mt" 88 _efl_threads_cflags="-mt"
89 _efl_thread_libs="-mt" 89 _efl_threads_libs="-mt"
90 ;; 90 ;;
91 *) 91 *)
92 _efl_thread_cflags="-pthread" 92 _efl_threads_cflags="-pthread"
93 _efl_thread_libs="-pthread" 93 _efl_threads_libs="-pthread"
94 ;; 94 ;;
95esac 95esac
96 96
@@ -127,8 +127,8 @@ fi
127EFL_PTHREAD_CFLAGS="" 127EFL_PTHREAD_CFLAGS=""
128EFL_PTHREAD_LIBS="" 128EFL_PTHREAD_LIBS=""
129if test "x${_efl_have_posix_threads}" = "xyes" ; then 129if test "x${_efl_have_posix_threads}" = "xyes" ; then
130 EFL_PTHREAD_CFLAGS=${_efl_thread_cflags} 130 EFL_PTHREAD_CFLAGS=${_efl_threads_cflags}
131 EFL_PTHREAD_LIBS=${_efl_thread_libs} 131 EFL_PTHREAD_LIBS=${_efl_threads_libs}
132fi 132fi
133 133
134AC_SUBST(EFL_PTHREAD_CFLAGS) 134AC_SUBST(EFL_PTHREAD_CFLAGS)
diff --git a/legacy/eio/src/lib/Makefile.am b/legacy/eio/src/lib/Makefile.am
index da53b2aeb0..73d3c231a4 100644
--- a/legacy/eio/src/lib/Makefile.am
+++ b/legacy/eio/src/lib/Makefile.am
@@ -1,6 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = @EIO_CFLAGS@ \ 3AM_CPPFLAGS = @EIO_CFLAGS@ \
4@EFL_PTHREAD_CFLAGS@ \
4@EFL_EIO_BUILD@ 5@EFL_EIO_BUILD@
5 6
6lib_LTLIBRARIES = libeio.la 7lib_LTLIBRARIES = libeio.la
@@ -27,7 +28,7 @@ libeio_la_SOURCES += eio_monitor_win32.c
27endif 28endif
28endif 29endif
29 30
30libeio_la_LIBADD = @EIO_LIBS@ 31libeio_la_LIBADD = @EIO_LIBS@ @EFL_PTHREAD_LIBS@
31libeio_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 32libeio_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
32 33
33EXTRA_DIST = eio_private.h 34EXTRA_DIST = eio_private.h