X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=41cf8d1854ae85569700670423ec2e9a4bef1469;hp=c5d35b08d3792c950fce24e807254877aa19c4a6;hb=65efc4dd0a947e1b4620d93c88d771b83bc32dac;hpb=141269ce5f566fcd7ed188ebe9bb878bf4b32018 diff --git a/configure.in b/configure.in index c5d35b0..41cf8d1 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2002 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.89 2002-09-16 18:45:13 adam Exp $ +dnl $Id: configure.in,v 1.99 2002-12-16 13:13:53 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.9.1) +AM_INIT_AUTOMAKE(yaz, 1.9.2) dnl AC_SUBST(READLINE_LIBS) AC_SUBST(YAZ_CONF_CFLAGS) @@ -23,7 +23,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.2* \ /usr/share/sgml/docbook/xml-dtd-4.1 \ /usr/share/sgml/docbook/dtd/xml/4.0 \ /usr/lib/sgml/dtd/docbook-xml @@ -47,8 +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.64 \ - /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \ + /usr/share/sgml/docbook/dsssl-stylesheets-1.* \ /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh do if test -f $d/html/docbook.dsl; then @@ -140,57 +139,73 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then ],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 iconv_open) +AC_CHECK_FUNCS(vsnprintf gettimeofday poll) 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_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 -], - [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 + #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]) @@ -221,7 +236,7 @@ if test "$enable_tcpd" != ""; then fi dnl dnl ------ Headers -AC_CHECK_HEADERS(fnmatch.h) +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) @@ -305,11 +320,6 @@ AC_SUBST(YAZ_BUILD_ROOT) YAZ_SRC_ROOT=`cd ${srcdir}; pwd` YAZ_BUILD_ROOT=`pwd` dnl -if test -f ${srcdir}/lib/yaz-config.in; then - rm ${srcdir}/lib/yaz-config.in -fi -sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in -dnl dnl ------ Makefiles dnl AC_OUTPUT([ @@ -322,8 +332,6 @@ ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile -tab/Makefile -retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile @@ -336,6 +344,6 @@ doc/yaz.xml doc/yazhtml.dsl doc/yazphp.dsl doc/yazprint.dsl +doc/tkl.xsl 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])