Fixes for GNU threads (not working yet).

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

diff --git a/configure.in b/configure.in
index 84fa72f..9da2915 100644 (file)
--- 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.43 2001-04-05 13:08:48 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
@@ -23,8 +23,13 @@ else
        EXTRAMODULE=asn
        HFILE=${srcdir}/asn/prt-proto.h
 fi
-AC_ARG_ENABLE(module,[  --enable-module=\"mod ..\" ill],[
- EXTRAMODULE="$EXTRAMODULE $enable_module"])
+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"
@@ -117,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)
@@ -133,11 +156,10 @@ 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
@@ -153,7 +175,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 ccl tab retrieval server include lib client ztest"
+SUBDIRS_VAR="util odr $EXTRAMODULE zutil comstack tab retrieval server include lib client ztest"
 AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl