X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=ead21ac38dfba249f0ec92594d4d863f3ff88187;hb=48abc88bc981af496e660e8f8a7a4aa678781623;hp=60411a1375bc12bae90955ba72074e5b6ab8b84b;hpb=22f4e21c81ec94ad74eb7a329482cbe4a836cec9;p=yaz-moved-to-github.git diff --git a/configure.in b/configure.in index 60411a1..ead21ac 100644 --- a/configure.in +++ b/configure.in @@ -1,38 +1,65 @@ -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.64 2002-03-18 12:22:00 adam Exp $ +dnl $Id: configure.in,v 1.79 2002-08-17 07:56:59 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.6) +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/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/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) @@ -46,6 +73,31 @@ if test "$checkBoth" = "1"; then fi AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) dnl +dnl +dnl ------ EXPAT +expat=yes +AC_ARG_WITH(expat, [ --with-expat[=DIR] EXPAT library in DIR],[expat=$withval]) +if test "$expat" != "no"; then + xLIBS="$LIBS"; + xCFLAGS="$CFLAGS"; + if test "$expat" != "yes"; then + EXPAT_CFLAGS="-I$expat/include" + EXPAT_LIBS="-L$expat/lib" + CFLAGS="$EXPAT_CFLAGS $CFLAGS" + LIBS="$EXPAT_LIBS $LIBS" + fi + AC_CHECK_LIB(expat,XML_ParserCreate,[LIBS="$LIBS -lexpat"]) + if test "$ac_cv_lib_expat_XML_ParserCreate" = "yes"; then + AC_CHECK_HEADERS(expat.h) + if test "$ac_cv_header_expat_h" = "yes"; then + YAZ_CONF_CFLAGS="$YAZ_CONF_CFLAGS -DYAZ_HAVE_EXPAT=1" + fi + else + LIBS="$xLIBS" + CFLAGS="$xCFLAGS" + fi +fi +dnl dnl ------ Open SSL openssl=no AC_ARG_WITH(openssl, [ --with-openssl[=DIR] OpenSSL library in DIR], [openssl=$withval]) @@ -78,6 +130,7 @@ if test "$openssl" != "no"; then 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"], @@ -88,6 +141,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) @@ -124,7 +198,7 @@ if test "$enable_tcpd" != ""; then fi dnl dnl ------ Headers -AC_CHECK_HEADERS(fnmatch.h) +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) @@ -168,7 +242,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 @@ -182,6 +256,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 @@ -212,8 +287,6 @@ 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([ @@ -237,6 +310,9 @@ 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])