X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=61c29d32c1976b52e62919a9426f590029242f7a;hp=51392a8a390421d7cd07231c62e067885c203295;hb=aea27bc0e4e3f310196f0e6cee3de8cac69e9806;hpb=13671e7cc0f3dd4e4b02f94d64a50778c5696ba6 diff --git a/configure.in b/configure.in index 51392a8..61c29d3 100644 --- a/configure.in +++ b/configure.in @@ -1,38 +1,67 @@ -dnl YAZ Toolkit, Index Data 1994-2001 +dnl YAZ Toolkit, Index Data 1994-2002 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.55 2001-11-18 21:14:22 adam Exp $ +dnl $Id: configure.in,v 1.82 2002-08-29 16:18:34 mike Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.3) +AM_INIT_AUTOMAKE(yaz, 1.8.9) dnl AC_SUBST(READLINE_LIBS) +AC_SUBST(YAZ_CONF_CFLAGS) dnl ------ Checking programs AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AM_DISABLE_SHARED AM_PROG_LIBTOOL -dnl -dnl ----- yaz-comp: The Yaz Compiler -AC_SUBST(EXTRAMODULE) -AC_SUBST(EXTRALIB) - -EXTRAMODULE="z39.50 zutil" - -AC_ARG_ENABLE(modules,[ --enable-modules=\"mod ..\" ill],[ -if test "$enable_modules" != "no"; then - EXTRAMODULE="$EXTRAMODULE $enable_modules" -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 ],[ -EXTRAMODULE="$EXTRAMODULE ill ccl zoom" + 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 ]) -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_SUBST(DSSSL_DIR) +AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use 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.64 \ + /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \ + /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 +]) +dnl dnl ----- Sockets checkBoth=0 AC_CHECK_FUNC(connect) @@ -49,13 +78,36 @@ 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_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"], @@ -66,6 +118,27 @@ AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READ 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 ------ various functions AC_CHECK_FUNCS(vsnprintf gettimeofday poll) @@ -102,6 +175,7 @@ if test "$enable_tcpd" != ""; then fi dnl dnl ------ Headers +AC_CHECK_HEADERS(fnmatch.h iconv.h) AC_STDC_HEADERS if test "$ac_cv_header_stdc" = "no"; then AC_MSG_WARN(Your system doesn't seem to support ANSI C) @@ -113,6 +187,7 @@ 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 @@ -144,7 +219,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then thread_ok=yes,thread_ok=no) if test "$thread_ok" = "yes"; then AC_MSG_RESULT(yes) - LIBTHREAD=-lpthread + LIBTHREAD="-lpthread" CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT" HAVETHREADS=1 else @@ -158,6 +233,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then 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 @@ -168,6 +244,15 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then LIBS=$OLIBS fi AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1") +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) @@ -179,12 +264,11 @@ 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 comstack $EXTRAMODULE tab retrieval server include lib include client ztest" -AC_SUBST(SUBDIRS_VAR) dnl ------ Makefiles dnl AC_OUTPUT([ Makefile +yaz.spec util/Makefile odr/Makefile z39.50/Makefile @@ -202,6 +286,10 @@ zoom/Makefile client/Makefile ztest/Makefile doc/Makefile +doc/yaz.xml +doc/yazhtml.dsl +doc/yazphp.dsl +doc/yazprint.dsl yaz-config lib/yaz-config ],[chmod +x yaz-config lib/yaz-config])