X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=9da2915e8a8dc379d1933b4beeb55b83b29fa8d5;hp=e264fdd3d235259538101c3f42456ba6a23f12c2;hb=c9b1ffcb5d47aa1cd0c0812c55bd1a3301cf834c;hpb=b0ea0712dd81e2d3dd25ec14c0bb9a6ce0a51056

diff --git a/configure.in b/configure.in
index e264fdd..9da2915 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl YAZ Toolkit, Index Data 1994-2000
+dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.40 2001-02-21 09:03:34 adam Exp $
+dnl $Id: configure.in,v 1.47 2001-10-04 00:37:58 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -13,23 +13,32 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl 
 dnl ----- yaz-comp: The Yaz Compiler
-AC_SUBST(ASNMODULE)
-AC_SUBST(ILLMODULE)
-AC_SUBST(ILLLIB)
+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
-	ASNMODULE="z39.50"
-	ILLMODULE="ill"
-	ILLLIB=../ill/libill.la
-	ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
+	EXTRAMODULE="z39.50"
 	HFILE=${srcdir}/include/yaz/z-proto.h
 else
-	ILLMODULE=""
-	ASNMODULE=asn
-	ILLLIB=""
-	ASN_MAKEFILES="asn/Makefile"
+	EXTRAMODULE=asn
 	HFILE=${srcdir}/asn/prt-proto.h
 fi
+AC_ARG_ENABLE(modules,[  --enable-modules=\"mod ..\" ill],[
+if test "$enable_modules" != "no"; then
+		EXTRAMODULE="$EXTRAMODULE $enable_modules"
+fi
+],[
+EXTRAMODULE="$EXTRAMODULE ill ccl"
+])
+EXTRALIB=""
+for module in $EXTRAMODULE; do
+	EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
+	if test $module = "z39.50"; then
+		module=z3950
+	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
@@ -113,10 +122,28 @@ 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
+HAVETHREADS=0
+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"
+			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)
@@ -129,26 +156,27 @@ if test "$enable_threads" = "yes"; then
 	if test "$thread_ok" = "yes"; then
 		LIBTHREAD=-lpthread
 		AC_MSG_RESULT(yes)
+		AC_CHECK_HEADERS(pthread.h)
 		HAVETHREADS=1
 	else
-		LIBTHREAD=""
 		AC_MSG_RESULT(no)
-		HAVETHREADS=0
 	fi
 	LIBS=$OLIBS
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl ------ Using this for "in-source" yaz-config
 AC_SUBST(YAZ_SRC_ROOT)
-YAZ_SRC_ROOT=`pwd`
+AC_SUBST(YAZ_BUILD_ROOT)
+YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
+YAZ_BUILD_ROOT=`pwd`
 dnl
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
-AC_SUBST(SUBDIRS_VAR)
-if test -f lib/yaz-config.in; then
-	rm lib/yaz-config.in
+if test -f ${srcdir}/lib/yaz-config.in; then
+	rm ${srcdir}/lib/yaz-config.in
 fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in
+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"
+AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
 AC_OUTPUT([