- Merge Ewd functions into Ecore.

- Version number bump

SVN revision: 9385

diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index c3ffb5396bb1eb06560a9d3ad12d6db4cf9eb364..ae489c7c4295dab4c0568dd847dc65458f02b2aa 100644 (file)
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(ecore, 1.0.0_pre4)
+AM_INIT_AUTOMAKE(ecore, 1.0.0_pre6)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
@@ -556,6 +556,52 @@ else
   AM_CONDITIONAL(BUILD_ECORE_CONFIG, false)
 fi
 
+AC_ARG_ENABLE(pthreads,
+[--disable-pthreads            disable building with pthread support],
+[
+  if test x$enableval = xyes; then
+    pthreads=yes
+  else
+    pthreads=no
+  fi
+]
+)
+
+if test x$pthreads = xyes ; then
+AC_CHECK_HEADERS(pthread.h,pthread_header_ok="yes", pthread_header_ok="no")
+   if test "$pthread_header_ok" = "yes"; then
+      AC_CHECK_LIB(pthread, main, PTHREAD_LIBS="-lpthread", PTHREAD_LIBS="error")
+      if test "$PTHREAD_LIBS" = "error"; then
+         AC_CHECK_LIB(c_r, main, PTHREAD_LIBS="-pthread", pthread_lib_ok="no")
+      fi
+   fi
+   if test "$pthread_header_ok" = "no" -o "$pthread_lib_ok" = "no"; then
+      HAVE_PTHREADS=0
+   else
+      HAVE_PTHREADS=1
+   fi
+   if test "$PTHREAD_LIBS" = "-pthread"; then
+      LIBS="$LIBS $PTHREAD_LIBS"
+   else
+      PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+      LIBS="$LIBS $PTHREAD_LIBS"
+   fi
+else
+   HAVE_PTHREADS=0
+   PTHREAD_LIBS=""
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(HAVE_PTHREADS)
+
+AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
+AC_SUBST(dlopen_libs)
+
+dnl Checking for Perl:
+AC_PATH_PROG(PERL,perl,0)
+AC_SUBST(PERL)
+
+
 AC_SUBST(ecore_config_cflags)
 AC_SUBST(ecore_config_libs)
 

diff --git a/legacy/ecore/ecore.spec b/legacy/ecore/ecore.spec
index 26fea767c389fd9d4f3701eef2a287e32bc64c18..08fc4becc6cc933c8759781a2ebc524c62804d8e 100644 (file)
--- a/legacy/ecore/ecore.spec
+++ b/legacy/ecore/ecore.spec
@@ -1,6 +1,6 @@
 # this is NOT relocatable, unless you alter the patch!
 %define        name    ecore
-%define        ver     1.0.0_pre4
+%define        ver     1.0.0_pre6
 %define        rel     1
 %define prefix  /usr