Added defines YAZ_GNU_THREADS, YAZ_POSIX_THREADS in code and yaz-config
[yaz-moved-to-github.git] / configure.in
index 5e6d0c0..cdb3556 100644 (file)
@@ -1,34 +1,54 @@
-dnl YAZ Toolkit
-dnl (c) Index Data 1994-1999
+dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.14 1999-12-16 23:36:19 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
+AC_SUBST(READLINE_LIBS)
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-AC_PROG_RANLIB
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
 dnl 
-dnl ----- Build root
-AC_SUBST(build_root)
-AC_ARG_WITH(build-root, [  --with-buildroot        RPM Build root],[build_root=$withval],[build_root=""])
-dnl
-dnl ----- YC: The Yaz Compiler
-AC_SUBST(ASNMODULE)
-AC_SUBST(ILLMODULE)
-AC_SUBST(ILLLIB)
-AC_ARG_ENABLE(yc,[  --enable-yc             compile using YAZ' ASN.1 Compiler], , enable_yc=yes)
-if test "$enable_yc" = "yes"; then
-       ASNMODULE="z39.50"
-       ILLMODULE="ill"
-       ILLLIB=libill.a
-       cp -f include/yaz/z-proto.h include/yaz/proto.h
+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
+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
+       AC_MSG_RESULT(no)
 else
-       ILLMODULE=""
-       ASNMODULE=asn
-       ILLLIB=""
-       cp -f include/yaz/prt-proto.h include/yaz/proto.h
+       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
@@ -44,28 +64,52 @@ 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
-AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"])
-AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
+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 $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)
 fi
+dnl ------ snprintf
+AC_CHECK_FUNCS(vsnprintf gettimeofday)
 dnl
 dnl ------ tcpd
-AC_ARG_ENABLE(tcpd,[  --enable-tcpd           enable TCP wrapper for server if available])
-if test "$enable_tcpd" = "yes"; then
-       AC_MSG_CHECKING(for working tcpd.h)
+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
+               LIBS="$LIBS -L$enable_tcpd/lib"
+               CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
+       fi
+       AC_MSG_CHECKING(for working tcpd.h)
        LIBS="$LIBS -lwrap -lnsl"
        AC_TRY_LINK([#include <syslog.h>
-       #include <tcpd.h>
+#include <tcpd.h>
        int allow_severity = LOG_INFO;
        int deny_severity = LOG_WARNING;],
        [struct request_info request_info; int i;
-       i = hosts_access(&request_info);],tcpd_ok=1, tcpd_ok=0)
+       i = hosts_access(&request_info);],
+       tcpd_ok=1, tcpd_ok=0)
        if test "$tcpd_ok" = "0"; then
                AC_MSG_RESULT(no)
                LIBS=$oldLibs
+               CPPFLAGS=$oldCPPFLAGS
        else
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_TCPD_H)
@@ -78,16 +122,85 @@ 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, [  --enable-threads        enable threads if available])
-if test "$enable_threads" = "yes"; then
-       AC_CHECK_HEADERS(pthread.h threads.h)
-       AC_CHECK_FUNC(pthread_mutex_lock)
-       if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
-               AC_CHECK_LIB(pthread, main)
+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>
+       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
+               LIBTHREAD=-lpthread
+               AC_MSG_RESULT(yes)
+               CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+               HAVETHREADS=1
+       else
+               AC_MSG_RESULT(no)
        fi
-       AC_DEFINE(_REENTRANT)
+       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
+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
-AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile ill/Makefile)
+dnl
+AC_OUTPUT([
+Makefile
+util/Makefile
+odr/Makefile
+z39.50/Makefile
+asn/Makefile
+ill/Makefile
+zutil/Makefile
+comstack/Makefile
+ccl/Makefile
+tab/Makefile
+retrieval/Makefile
+server/Makefile
+include/Makefile
+include/yaz/Makefile
+lib/Makefile
+client/Makefile
+ztest/Makefile
+doc/Makefile
+yaz-config
+lib/yaz-config
+],[chmod +x yaz-config lib/yaz-config])