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

diff --git a/configure.in b/configure.in
index cd22775..a26030c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 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.52 2001-10-28 23:10:02 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.7)
+AM_INIT_AUTOMAKE(yaz, 1.8.1)
 dnl
 AC_SUBST(READLINE_LIBS)
 dnl ------ Checking programs
@@ -15,23 +15,17 @@ dnl
 dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(EXTRAMODULE)
 AC_SUBST(EXTRALIB)
-AC_ARG_ENABLE(comp,[  --disable-comp          use old encoders, i.e. disable the YAZ ASN.1 Compiler], , enable_comp=yes)
-if test "$enable_comp" = "yes"; then
-	EXTRAMODULE="z39.50"
-	HFILE=${srcdir}/include/yaz/z-proto.h
-else
-	EXTRAMODULE=asn
-	HFILE=${srcdir}/asn/prt-proto.h
-fi
+
+EXTRAMODULE="z39.50 zutil"
+
 AC_ARG_ENABLE(modules,[  --enable-modules=\"mod ..\" ill],[
 if test "$enable_modules" != "no"; then
 		EXTRAMODULE="$EXTRAMODULE $enable_modules"
 fi
 ],[
-EXTRAMODULE="$EXTRAMODULE ill ccl"
+EXTRAMODULE="$EXTRAMODULE ill ccl zoom"
 ])
 EXTRALIB=""
-echo $EXTRAMODULE
 for module in $EXTRAMODULE; do
 	EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
 	if test $module = "z39.50"; then
@@ -39,19 +33,6 @@ for module in $EXTRAMODULE; do
 	fi
 	AC_DEFINE_UNQUOTED(YAZ_MODULE_${module})
 done
-	
-AC_MSG_CHECKING(whether proto.h needs to be generated)
-yaz_include=${srcdir}/include/yaz
-if test -r ${yaz_include}/proto.h && cmp -s $HFILE ${yaz_include}/proto.h; then
-	AC_MSG_RESULT(no)
-else
-	AC_MSG_RESULT(yes)
-	cp -f $HFILE ${yaz_include}/proto.h
-	if test "$enable_comp" != "yes"; then
-		cp ${srcdir}/asn/*.h ${yaz_include}
-	fi
-fi
-dnl
 dnl ----- Sockets
 checkBoth=0
 AC_CHECK_FUNC(connect)
@@ -123,11 +104,33 @@ 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
+	OCC=$CC
 	AC_CHECK_LIB(pthread,main)
 	AC_MSG_CHECKING(for working POSIX Threads)
 	AC_TRY_LINK([#include <pthread.h>
@@ -137,14 +140,28 @@ if test "$enable_threads" = "yes"; then
 	pthread_create (&pthread_id, 0, func, 0);],
 		thread_ok=yes,thread_ok=no)
 	if test "$thread_ok" = "yes"; then
-		LIBTHREAD=-lpthread
 		AC_MSG_RESULT(yes)
+		LIBTHREAD=-lpthread
+		CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
 		HAVETHREADS=1
 	else
-		LIBTHREAD=""
+		CC="$CC -pthread"
+		AC_TRY_LINK([#include <pthread.h>
+			void *func(void *p) { return 0; }
+			],[
+			pthread_t pthread_id;
+			pthread_create (&pthread_id, 0, func, 0);],
+			thread_ok=yes,thread_ok=no)
+		if test "$thread_ok" = "yes"; then
+			AC_MSG_RESULT([yes,BSD])
+			CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+			HAVETHREADS=1
+		fi
+	fi
+	if test "$thread_ok" = "no"; then
 		AC_MSG_RESULT(no)
-		HAVETHREADS=0
 	fi
+	CC=$OCC
 	LIBS=$OLIBS
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
@@ -159,7 +176,7 @@ if test -f ${srcdir}/lib/yaz-config.in; then
 fi
 sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
 dnl
-SUBDIRS_VAR="util odr $EXTRAMODULE zutil comstack tab retrieval server include lib client ztest"
+SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib include client ztest"
 AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
@@ -168,7 +185,6 @@ Makefile
 util/Makefile
 odr/Makefile
 z39.50/Makefile
-asn/Makefile
 ill/Makefile
 zutil/Makefile
 comstack/Makefile
@@ -179,6 +195,7 @@ server/Makefile
 include/Makefile
 include/yaz/Makefile
 lib/Makefile
+zoom/Makefile
 client/Makefile
 ztest/Makefile
 doc/Makefile