X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=cdb3556d82aaf5e51eacfbd3ea5f06be02c5b035;hp=cd227755797b0ef3b2b75155d749d12a33ce3a93;hb=9158f8e318f25cb16171433742950236cae96d36;hpb=7057699040b614f56be178f3672b4a2b95301d5f

diff --git a/configure.in b/configure.in
index cd22775..cdb3556 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.44 2001-04-06 12:26:46 adam Exp $
+dnl $Id: configure.in,v 1.48 2001-10-05 13:55:17 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -31,7 +31,6 @@ fi
 EXTRAMODULE="$EXTRAMODULE ill ccl"
 ])
 EXTRALIB=""
-echo $EXTRAMODULE
 for module in $EXTRAMODULE; do
 	EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
 	if test $module = "z39.50"; then
@@ -123,10 +122,31 @@ if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
 dnl
-dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
 AC_SUBST(LIBTHREAD)
-if test "$enable_threads" = "yes"; then
+AC_SUBST(CFLAGSTHREADS)
+HAVETHREADS=0
+CFLAGSTHREADS=""
+LIBTHREAD=""
+dnl
+AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
+AC_SUBST(LIBPTH)
+if test "$enable_pth" = "yes"; then
+	OLIBS=$LIBS
+	AC_CHECK_LIB(pth,main)
+	if test "$ac_cv_lib_pth_main" = "yes"; then
+        	AC_CHECK_HEADERS(pth.h)
+		if test "$ac_cv_header_pth_h" = "yes"; then
+			LIBTHREAD="-lpth"
+			CFLAGSTHREADS="-DYAZ_GNU_THREADS=1"
+			HAVETHREADS=1
+		fi
+	fi	
+	LIBS=$OLIBS
+fi
+dnl
+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
 	OLIBS=$LIBS
 	AC_CHECK_LIB(pthread,main)
 	AC_MSG_CHECKING(for working POSIX Threads)
@@ -139,11 +159,10 @@ if test "$enable_threads" = "yes"; then
 	if test "$thread_ok" = "yes"; then
 		LIBTHREAD=-lpthread
 		AC_MSG_RESULT(yes)
+		CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
 		HAVETHREADS=1
 	else
-		LIBTHREAD=""
 		AC_MSG_RESULT(no)
-		HAVETHREADS=0
 	fi
 	LIBS=$OLIBS
 fi