Added defines YAZ_GNU_THREADS, YAZ_POSIX_THREADS in code and yaz-config
[yaz-moved-to-github.git] / configure.in
index 187db9f..cdb3556 100644 (file)
@@ -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.30 2000-07-06 10:38:47 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
@@ -13,30 +13,42 @@ 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"
-       HFILE=z-proto.h
+       EXTRAMODULE="z39.50"
+       HFILE=${srcdir}/include/yaz/z-proto.h
 else
-       ILLMODULE=""
-       ASNMODULE=asn
-       ILLLIB=""
-       ASN_MAKEFILES="asn/Makefile"
-       HFILE=prt-proto.h
+       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 ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
+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 ${yaz_include}/$HFILE ${yaz_include}/proto.h
+       cp -f $HFILE ${yaz_include}/proto.h
+       if test "$enable_comp" != "yes"; then
+               cp ${srcdir}/asn/*.h ${yaz_include}
+       fi
 fi
 dnl
 dnl ----- Sockets
@@ -52,12 +64,23 @@ if test "$checkBoth" = "1"; then
 fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
+dnl ------ Open SSL
+openssl=no
+AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    OpenSSL library in DIR], [openssl=$withval])
+if test "$openssl" = "yes"; then
+       AC_CHECK_LIB(crypto, main)
+       AC_CHECK_LIB(ssl, SSL_new)
+       if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+               AC_CHECK_HEADERS(openssl/ssl.h)
+       fi
+fi
 dnl ------ GNU Readline
+READLINE_SHARED_LIBADD=""
+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
+       AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
+)
 READLINE_LIBS=""
-AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline"])
-if test "$ac_cv_lib_readline_readline" = "no"; then
-       AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
-fi
+AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
 AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
        AC_CHECK_HEADERS(readline/readline.h readline/history.h)
@@ -66,8 +89,8 @@ dnl ------ snprintf
 AC_CHECK_FUNCS(vsnprintf gettimeofday)
 dnl
 dnl ------ tcpd
-AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]    enable TCP wrapper for server if available])
-if test "$enable_tcpd" != "no"; then
+AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
+if test "$enable_tcpd" != ""; then
        oldLibs=$LIBS
        oldCPPFLAGS=$CPPFLAGS
        if test "$enable_tcpd" != "yes"; then
@@ -99,29 +122,64 @@ 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 threads],[enable_threads=$enableval],[enable_threads=yes])
-if test "$enable_threads" = "yes"; then
+AC_SUBST(LIBTHREAD)
+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)
        AC_TRY_LINK([#include <pthread.h>
-       int func(void *p) { return 0; }
+       void *func(void *p) { return 0; }
        ],[
        pthread_t pthread_id;
-       int r = pthread_create (&pthread_id, 0, func, 0);],
+       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)
-               AC_DEFINE(HAVE_PTHREAD_H)
-               AC_DEFINE(_REENTRANT)
+               CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+               HAVETHREADS=1
        else
                AC_MSG_RESULT(no)
        fi
+       LIBS=$OLIBS
 fi
+AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
+dnl ------ Using this for "in-source" yaz-config
+AC_SUBST(YAZ_SRC_ROOT)
+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 ${srcdir}/lib/yaz-config.in; then
+       rm ${srcdir}/lib/yaz-config.in
+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"
+AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
 AC_OUTPUT([
@@ -143,4 +201,6 @@ lib/Makefile
 client/Makefile
 ztest/Makefile
 doc/Makefile
-lib/yaz-config],[chmod +x lib/yaz-config])
+yaz-config
+lib/yaz-config
+],[chmod +x yaz-config lib/yaz-config])