X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=c5d35b08d3792c950fce24e807254877aa19c4a6;hp=f6849683c69c78f4a4e5057d59691c41ab287869;hb=141269ce5f566fcd7ed188ebe9bb878bf4b32018;hpb=1f4ebcf4fbc8183c69b79b2b8ea86030732bb659 diff --git a/configure.in b/configure.in index f684968..c5d35b0 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.71 2002-04-15 12:03:39 adam Exp $ +dnl $Id: configure.in,v 1.89 2002-09-16 18:45:13 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.7) +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 @@ -23,6 +24,7 @@ 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/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 @@ -46,6 +48,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.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 @@ -59,27 +62,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) @@ -125,6 +107,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"], @@ -135,7 +118,7 @@ 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) - OLDLIBS=$LIBS + xLIBS=$LIBS LIBS="$LIBS $READLINE_LIBS" AC_TRY_LINK([ #include @@ -146,13 +129,68 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then rl_attempted_completion_over = 0; } ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER)) - LIBS=$OLDLIBS + 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) +AC_CHECK_FUNCS(vsnprintf gettimeofday poll iconv_open) if test "$ac_cv_func_poll" = "yes"; then AC_CHECK_HEADERS(sys/poll.h) fi +if test "$ac_cv_func_iconv_open" = "no"; then + oldLibs=$LIBS + LIBS="$LIBS -liconv" + AC_CHECK_FUNCS(iconv_open) + if test "$ac_cv_func_iconv_open" = "no"; then + LIBS=$oldLibs + fi +fi +if test "$ac_cv_func_iconv_open" = "yes"; then + AC_CHECK_HEADERS(iconv.h) +fi +dnl ------ socklen_t +dnl AC_CHECK_TYPES(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 +#include +#include +], + [socklen_t len;], + ac_cv_check_socklen_t=yes, + ac_cv_check_socklen_t=no)]) +AC_MSG_RESULT($ac_cv_check_socklen_t) +if test "$ac_cv_check_socklen_t" = "yes"; then + AC_DEFINE(HAVE_SOCKLEN_T) +else + AC_MSG_CHECKING(whether net size is of type size_t) + AC_CACHE_VAL(ac_cv_check_getpeername_accepts_size_t, + [ac_cv_check_getpeername_accepts_size_t='' + AC_TRY_COMPILE([ +#include +#include +#include +#include +], + [size_t mylen; getpeername(0, (struct sockaddr *)NULL, &mylen);], + ac_cv_check_getpeername_accepts_size_t=yes, + ac_cv_check_getpeername_accepts_size_t=no)]) + AC_MSG_RESULT($ac_cv_check_getpeername_accepts_size_t) + if test "$ac_cv_check_getpeername_accepts_size_t" = yes; then + AC_DEFINE(GETPEERNAME_ACCEPTS_SIZE_T_FOR_THIRD_ARGUMENT) + fi +fi dnl dnl ------ tcpd AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) @@ -272,8 +310,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 client ztest" -AC_SUBST(SUBDIRS_VAR) dnl ------ Makefiles dnl AC_OUTPUT([ @@ -292,9 +328,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