Towards 3.0.2.

[yaz-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2febadd..e87b59b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1995-2007
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.71 2007-03-16 10:50:19 adam Exp $
+dnl $Id: configure.ac,v 1.78 2007-05-08 08:27:13 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.55],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.2],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -340,8 +340,8 @@ dnl ------ POSIX Threads
 AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
     ACX_PTHREAD([
+           OCFLAGS=$CFLAGS
            CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-           AC_DEFINE(YAZ_POSIX_THREADS)
            dnl unfortunately empty thread lib spec is problematic because 
             dnl 'yaz-config --cflags' is not always passed to linker in 
             dnl applications using YAZ (such as Zebra).
@@ -356,8 +356,8 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
                done
                LIBS=$OLIBS
            fi
-           LIBS="$PTHREAD_LIBS $LIBS"
-           YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
+           CFLAGS=$OCFLAGS
+           PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
            ])
 fi