Implemented and-list and or-list for CCL module.
[yaz-moved-to-github.git] / configure.in
index 355dfc0..16c7a51 100644 (file)
@@ -1,23 +1,16 @@
-dnl YAZ Toolkit
-dnl (c) Index Data 1994-2000
+dnl YAZ Toolkit, Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.22 2000-03-02 08:48:20 adam Exp $
+dnl $Id: configure.in,v 1.37 2000-10-11 10:40:56 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.6)
+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
-AC_CHECK_PROGS(have_sgml2txt,sgml2txt,no)
-AC_CHECK_PROGS(have_sgml2latex,sgml2latex,no)
-AC_CHECK_PROGS(have_sgml2html,sgml2html,no)
-if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" -o "$have_sgml2html" = "no"; then
-       DOCMODULE=""
-else
-       DOCMODULE="doc"
-fi
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
 dnl 
 dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(ASNMODULE)
@@ -27,15 +20,26 @@ AC_ARG_ENABLE(comp,[  --disable-comp          use old encoders, i.e. disable the
 if test "$enable_comp" = "yes"; then
        ASNMODULE="z39.50"
        ILLMODULE="ill"
-       ILLLIB=../ill/libill.a
+       ILLLIB=../ill/libill.la
        ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
-       cp -f include/yaz/z-proto.h include/yaz/proto.h
+       HFILE=${srcdir}/include/yaz/z-proto.h
 else
        ILLMODULE=""
        ASNMODULE=asn
        ILLLIB=""
        ASN_MAKEFILES="asn/Makefile"
-       cp -f include/yaz/prt-proto.h include/yaz/proto.h
+       HFILE=${srcdir}/asn/prt-proto.h
+fi
+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
@@ -52,30 +56,40 @@ fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ GNU Readline
-AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"])
+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, [LIBS="$LIBS -lreadline -ltermcap"])
+       AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
 fi
-AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
+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)
@@ -89,19 +103,56 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available])
+AC_ARG_ENABLE(threads, [  --enable-threads        enable POSIX threads],[enable_threads=$enableval],[enable_threads=no])
 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_CHECK_LIB(pthread,main)
+       AC_MSG_CHECKING(for working POSIX Threads)
+       AC_TRY_LINK([#include <pthread.h>
+       int func(void *p) { return 0; }
+       ],[
+       pthread_t pthread_id;
+       int r = pthread_create (&pthread_id, 0, func, 0);],
+               thread_ok=yes,thread_ok=no)
+       if test "$thread_ok" = "yes"; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_PTHREAD_H)
+               AC_DEFINE(_REENTRANT)
+       else
+               AC_MSG_RESULT(no)
        fi
-       AC_DEFINE(_REENTRANT)
 fi
+dnl ------ Using this for "in-source" yaz-config
+AC_SUBST(YAZ_SRC_ROOT)
+YAZ_SRC_ROOT=`pwd`
 dnl
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE"
+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
+fi
+sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in
 dnl
 dnl ------ Makefiles
 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)
+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])