X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=bb952805d60c13a02a44bc1bf6c5f9c3c8134406;hp=706e1879f696b13c5882a902c22080b6a91bda60;hb=f512aa33473ae86f8e8efd8da749a82c398e87f0;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1 diff --git a/configure.in b/configure.in index 706e187..bb95280 100644 --- a/configure.in +++ b/configure.in @@ -1,47 +1,89 @@ -dnl YAZ Toolkit, Index Data 1994-2000 +dnl YAZ Toolkit, Index Data 1994-2003 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.38 2000-11-23 10:58:32 adam Exp $ +dnl $Id: configure.in,v 1.108 2003-02-18 20:21:22 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.7) +AM_INIT_AUTOMAKE(yaz, 1.9.3) dnl AC_SUBST(READLINE_LIBS) +AC_SUBST(YAZ_CONF_CFLAGS) dnl ------ Checking programs AC_PROG_CC AC_PROG_CPP +AC_CHECK_PROGS(YACC, 'bison -y') +test -z "$YACC" && AC_MSG_WARN([GNU bison not found]) AC_PROG_INSTALL AM_DISABLE_SHARED AM_PROG_LIBTOOL -dnl -dnl ----- yaz-comp: The Yaz Compiler -AC_SUBST(ASNMODULE) -AC_SUBST(ILLMODULE) -AC_SUBST(ILLLIB) -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=${srcdir}/include/yaz/z-proto.h -else - ILLMODULE="" - ASNMODULE=asn - ILLLIB="" - ASN_MAKEFILES="asn/Makefile" - 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 ----- DOCBOOK DTD +AC_SUBST(DTD_DIR) +AC_ARG_WITH(dtd, [ --with-dtd[=DIR] use docbookx.dtd in DIR], +[ + if test -f "$withval/docbookx.dtd"; then + DTD_DIR=$withval + fi +],[ + AC_MSG_CHECKING(for docbookx.dtd) + for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \ + /usr/share/sgml/docbook/xml-dtd-4.1.2* \ + /usr/share/sgml/docbook/xml-dtd-4.1 \ + /usr/share/sgml/docbook/dtd/xml/4.0 \ + /usr/lib/sgml/dtd/docbook-xml + do + if test -f $d/docbookx.dtd; then + AC_MSG_RESULT($d) + DTD_DIR=$d + break + fi + done + if test -z "$DTD_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +AC_SUBST(DSSSL_DIR) +AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] use Docbook DSSSL in DIR/{html,print}/docbook.dsl], +[ + if test -f "$withval/html/docbook.dsl"; then + DSSSL_DIR=$withval + fi +],[ + AC_MSG_CHECKING(for docbook.dsl) + for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \ + /usr/share/sgml/docbook/dsssl-stylesheets-1.* \ + /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh + do + if test -f $d/html/docbook.dsl; then + AC_MSG_RESULT($d) + DSSSL_DIR=$d + break + fi + done + if test -z "$DSSSL_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +AC_SUBST(XSL_DIR) +AC_ARG_WITH(xsl,[ --with-xsl[=DIR] use Docbook XSL in DIR/{htmlhelp,xhtml}], +[ + if test -f "$withval/htmlhelp/htmlhelp.xsl"; then + XSL_DIR=$withval + fi +],[ + AC_MSG_CHECKING(for htmlhelp.xsl) + for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \ + /usr/share/sgml/docbook/xsl-stylesheets-1.* + do + if test -f $d/htmlhelp/htmlhelp.xsl; then + AC_MSG_RESULT($d) + XSL_DIR=$d + break + fi + done + if test -z "$XSL_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +dnl dnl ----- Sockets checkBoth=0 AC_CHECK_FUNC(connect) @@ -57,26 +99,136 @@ 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_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval]) +AC_SUBST(SSL_CFLAGS) +AC_SUBST(SSL_LIBS) +AC_SUBST(SSL_DEFS) +USE_SSL=0 +SSL_CFLAGS="" +SSL_LIBS="" +SSL_DEFS="" +if test "$openssl" != "no"; then + xLIBS="$LIBS"; + xCFLAGS="$CFLAGS"; + if test "$openssl" != "yes"; then + SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl" + SSL_LIBS="-L$openssl/lib" + CFLAGS="$SSL_CFLAGS $CFLAGS" + LIBS="$SSL_LIBS $LIBS" + fi + AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"]) + LIBS="$LIBS $SSL_LIBS" AC_CHECK_LIB(ssl, SSL_new) if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then - AC_CHECK_HEADERS(openssl/ssl.h) + SSL_LIBS="$SSL_LIBS -lssl" + AC_CHECK_HEADER(openssl/ssl.h,[SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"; USE_SSL=1]) + else + SSL_LIBS="" fi + LIBS="$xLIBS" + CFLAGS="$xCFLAGS" fi +AM_CONDITIONAL(ISSSL, test $USE_SSL = "1") +dnl 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) + xLIBS=$LIBS + LIBS="$LIBS $READLINE_LIBS" + AC_TRY_LINK([ + #include + #include + ],[ + static void f() + { + rl_attempted_completion_over = 0; + } + ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER)) + AC_TRY_LINK([ + #include + #include + ],[ + static void f() + { + rl_completion_matches (0, 0); + } + ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)) + LIBS=$xLIBS fi -dnl ------ snprintf -AC_CHECK_FUNCS(vsnprintf gettimeofday) +dnl ------ iconv +AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX]) +if test "$with_iconv" != "no"; then + AC_MSG_CHECKING(for iconv) + oldLIBS="$LIBS" + oldCPPFLAGS="${CPPFLAGS}" + if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then + LIBS="$LIBS -L${with_iconv}/lib" + CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include" + fi + AC_TRY_LINK([ + #include + ],[ + static void f() {iconv_t t = iconv_open("", ""); } + ],[ + AC_DEFINE(HAVE_ICONV_H) + AC_MSG_RESULT(yes) + ],[ + LIBS="$LIBS -liconv" + AC_TRY_LINK([ + #include + ],[ + static void f() {iconv_t t = iconv_open("", ""); } + ],[ + AC_DEFINE(HAVE_ICONV_H) + AC_MSG_RESULT(yes) + ],[ + LIBS="$oldLIBS" + CPPFLAGS="$oldCPPFLAGS" + AC_MSG_RESULT(no) + ]) + ]) +fi +dnl ------ various functions +AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r) +if test "$ac_cv_func_poll" = "yes"; then + AC_CHECK_HEADERS(sys/poll.h) +fi +dnl ------ socklen_t +AC_MSG_CHECKING([for socklen_t]) +AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t='' + AC_TRY_COMPILE([ + #include + #include + #ifdef __cplusplus + extern "C" { + #endif + extern int accept(int, struct sockaddr *, socklen_t *); + #ifdef __cplusplus + } + #endif + ],,[ac_cv_check_socklen_t=socklen_t],[ + AC_TRY_COMPILE([ + #include + #include + #ifdef __cplusplus + extern "C" { + #endif + extern int accept(int, struct sockaddr *, size_t t *); + #ifdef __cplusplus + } + #endif + ],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int]) + ]) +]) +AC_MSG_RESULT($ac_cv_check_socklen_t) +AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t) dnl dnl ------ tcpd AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) @@ -107,68 +259,143 @@ if test "$enable_tcpd" != ""; then fi dnl dnl ------ Headers +AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h) AC_STDC_HEADERS 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 +AC_SUBST(CFLAGSTHREADS) +HAVETHREADS=0 +CFLAGSTHREADS="" +LIBTHREAD="" +dnl +dnl ------ GNU threads +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 + OCC=$CC AC_CHECK_LIB(pthread,main) AC_MSG_CHECKING(for working POSIX Threads) AC_TRY_LINK([#include - 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) + LIBTHREAD="-lpthread" + CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT" HAVETHREADS=1 else - LIBTHREAD="" + CC="$CC -pthread" + AC_TRY_LINK([#include + 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 + AC_MSG_RESULT([yes,BSD]) + CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT" + LIBTHREAD="-pthread" + HAVETHREADS=1 + fi + fi + if test "$thread_ok" = "no"; then AC_MSG_RESULT(no) - HAVETHREADS=0 fi + CC=$OCC 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` 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 +dnl ----- libXML2 +AC_SUBST(XML2_LIBS) +AC_SUBST(XML2_CFLAGS) +xml2dir=yes +AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval]) +if test "$xml2dir" = "yes"; then + for d in /usr /usr/local; do + if test -x $d/bin/xml2-config; then + xml2dir=$d + fi + done fi -sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in +if test "$xml2dir" != "no"; then + AC_MSG_CHECKING(for libXML2) + if test -x $xml2dir/bin/xml2-config; then + XML2_LIBS=`$xml2dir/bin/xml2-config --libs` + LIBS="$XML2_LIBS $LIBS" + XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags` + XML2_VER=`$xml2dir/bin/xml2-config --version` + AC_MSG_RESULT($XML2_VER) + AC_DEFINE(HAVE_XML2) + else + AC_MSG_RESULT(Not found) + fi +fi +dnl +dnl ------ Memory debugging +AC_ARG_ENABLE(memdebug, [ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none]) +if test "$enable_memdebug" = "yes"; then + AC_DEFINE(TRACE_XMALLOC,2) +elif test "$enable_memdebug" = "no"; then + AC_DEFINE(TRACE_XMALLOC,0) +fi +dnl +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 dnl ------ Makefiles dnl AC_OUTPUT([ Makefile +yaz.spec util/Makefile odr/Makefile z39.50/Makefile -asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile -tab/Makefile -retrieval/Makefile +cql/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile +zoom/Makefile doc/Makefile +doc/yaz.xml +doc/yazhtml.dsl +doc/yazphp.dsl +doc/yazprint.dsl +doc/tkl.xsl +doc/yazhtml.xsl +etc/Makefile yaz-config -lib/yaz-config -],[chmod +x yaz-config lib/yaz-config]) +],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])