X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=b50c583f5c88b814dd6e7cc29bb7543b0649546d;hb=bec71e151d306edbc5f58e19c7c139a196e867e9;hp=00c5c408ce1c1b6d72240fe826a3cd65424c0294;hpb=96809bad943557af7ac0d01d78ed7fc18dc18436;p=yaz-moved-to-github.git diff --git a/configure.in b/configure.in index 00c5c40..b50c583 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,11 @@ -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.65 2002-03-21 21:30:44 adam Exp $ +dnl $Id: configure.in,v 1.93 2002-09-25 08:11:33 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.6) +AM_INIT_AUTOMAKE(yaz, 1.9.1) dnl AC_SUBST(READLINE_LIBS) +AC_SUBST(YAZ_CONF_CFLAGS) dnl ------ Checking programs AC_PROG_CC AC_PROG_CPP @@ -22,7 +23,9 @@ AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], ],[ AC_MSG_CHECKING(for docbookx.dtd) for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \ - /usr/share/sgml/docbook/dtd/xml/4.0 \ + /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 @@ -44,6 +47,7 @@ AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbo ],[ 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 @@ -57,27 +61,6 @@ AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbo fi ]) 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 -],[ -EXTRAMODULE="$EXTRAMODULE ill ccl zoom" -]) -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 dnl ----- Sockets checkBoth=0 AC_CHECK_FUNC(connect) @@ -123,6 +106,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"], @@ -133,12 +117,95 @@ 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 ------ iconv +AC_ARG_WITH(iconv, [ --with-iconv[=DIR] iconv library in DIR]) +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) 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]) @@ -213,7 +280,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 @@ -227,6 +294,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 @@ -257,8 +325,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([ @@ -277,9 +343,9 @@ server/Makefile include/Makefile include/yaz/Makefile lib/Makefile -zoom/Makefile client/Makefile ztest/Makefile +zoom/Makefile doc/Makefile doc/yaz.xml doc/yazhtml.dsl