X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=2b7d3c54b51d711fc9b07c1022452a42f84b626e;hp=ff86ec64a362bc535a2767e55834c1aaa923fc1d;hb=965d5409daba88b43bbffb5bed90b58383c0cc3f;hpb=ba68124b7321baff51997107f1cf9f0a78f62351

diff --git a/configure.ac b/configure.ac
index ff86ec6..2b7d3c5 100644
--- 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.69 2007-03-16 08:08:10 adam Exp $
+dnl $Id: configure.ac,v 1.75 2007-04-17 20:26:18 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.54],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[2.1.99.3],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -179,7 +179,6 @@ if test "$with_iconv" != "no"; then
 fi
 dnl ------ libpcap / ziffy
 
-echo "ether_h = ${ac_cv_header_netinet_if_ether_h}"
 AC_SUBST(ZIFFY_PROG)
 AC_SUBST(PCAP_LIBS)
 AC_SUBST(PCAP_CFLAGS)
@@ -341,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).
@@ -357,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