X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=9dda795571cb7970f2b44b876f536e4766ab52fb;hp=4555068ef1191cc6854db4ad9a6958e86fb55d7f;hb=29c7ed2c90cd7aa5b69ec785c618b260f9525b1b;hpb=34203146338c5f6c89774bde4caad110345405bd diff --git a/configure.in b/configure.in index 4555068..9dda795 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,9 @@ dnl YAZ Toolkit, Index Data 1994-2003 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.107 2003-02-18 10:37:08 adam Exp $ +dnl $Id: configure.in,v 1.117 2003-10-27 12:21:21 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.9.3) +AM_INIT_AUTOMAKE(yaz, 2.0.5) +AM_MAINTAINER_MODE dnl AC_SUBST(READLINE_LIBS) AC_SUBST(YAZ_CONF_CFLAGS) @@ -17,7 +18,7 @@ AM_PROG_LIBTOOL dnl dnl ----- DOCBOOK DTD AC_SUBST(DTD_DIR) -AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], +AC_ARG_WITH(dtd, [ --with-dtd[=DIR] use docbookx.dtd in DIR], [ if test -f "$withval/docbookx.dtd"; then DTD_DIR=$withval @@ -41,7 +42,7 @@ AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], fi ]) AC_SUBST(DSSSL_DIR) -AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbook.dsl], +AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] use Docbook DSSSL in DIR/{html,print}/docbook.dsl], [ if test -f "$withval/html/docbook.dsl"; then DSSSL_DIR=$withval @@ -63,7 +64,7 @@ AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbo fi ]) AC_SUBST(XSL_DIR) -AC_ARG_WITH(xsl,[ --with-xsl[=DIR] Use XSL in DIR/{htmlhelp,xhtml}], +AC_ARG_WITH(xsl,[ --with-xsl[=DIR] use Docbook XSL in DIR/{htmlhelp,xhtml}], [ if test -f "$withval/htmlhelp/htmlhelp.xsl"; then XSL_DIR=$withval @@ -97,9 +98,9 @@ if test "$checkBoth" = "1"; then fi AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) dnl -dnl ------ Open SSL +dnl ------ OpenSSL openssl=no -AC_ARG_WITH(openssl, [ --with-openssl[=DIR] OpenSSL library in DIR], [openssl=$withval]) +AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval]) AC_SUBST(SSL_CFLAGS) AC_SUBST(SSL_LIBS) AC_SUBST(SSL_DEFS) @@ -163,7 +164,7 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then LIBS=$xLIBS fi dnl ------ iconv -AC_ARG_WITH(iconv, [ --with-iconv[=DIR] iconv library in DIR]) +AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX]) if test "$with_iconv" != "no"; then AC_MSG_CHECKING(for iconv) oldLIBS="$LIBS" @@ -201,29 +202,49 @@ if test "$ac_cv_func_poll" = "yes"; then AC_CHECK_HEADERS(sys/poll.h) fi dnl ------ socklen_t +dnl We check for socklen_t by making prototypes with the +dnl various types. First socklen_t, then size_t, finally int. +dnl If the prototype succeeds, we're probably safe. +dnl That works if accept is not preprocessor defined (such sa AIX) 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 +#include +#include +#ifdef __cplusplus +extern "C" { +#endif +#define try 1 +#ifdef AIX +#if AIX >= 51 +#define try 0 +#endif +#endif +#if try +extern int accept(int, struct sockaddr *, socklen_t *); +#endif +#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 +#include +#include +#ifdef __cplusplus +extern "C" { +#endif +#define try 1 +#ifdef AIX +#if AIX >= 42 +#define try 0 +#endif +#endif +#if try +extern int accept(int, struct sockaddr *, size_t t *); +#endif +#ifdef __cplusplus +} +#endif ],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int]) ]) ]) @@ -329,36 +350,11 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then fi AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1") dnl -dnl ----- libXSLT -AC_SUBST(XSLT_LIB) -AC_SUBST(XSLT_CFLAGS) -xsltdir=no -AC_ARG_WITH(xslt, [ --with-xslt[=PREFIX] Use libxslt in PREFIX/{lib,include}],[xsltdir=$withval]) -if test "$xsltdir" = "yes"; then - for d in /usr /usr/local; do - if test -x $d/bin/xslt-config; then - xsltdir=$d - fi - done -fi -if test "$xsltdir" != "no"; then - AC_MSG_CHECKING(for XSLT) - if test -x $xsltdir/bin/xslt-config; then - XSLT_LIB=`$xsltdir/bin/xslt-config --libs` - XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags` - XSLT_VER=`$xsltdir/bin/xslt-config --version` - AC_MSG_RESULT($XSLT_VER) - AC_DEFINE(HAVE_XSLT) - else - AC_MSG_RESULT(Not found) - fi -fi -dnl dnl ----- libXML2 AC_SUBST(XML2_LIBS) AC_SUBST(XML2_CFLAGS) -xml2dir=no -AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] Use libxml2 in PREFIX/{lib,include}],[xml2dir=$withval]) +xml2dir=yes +AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval]) if test "$xml2dir" = "yes"; then for d in /usr /usr/local; do if test -x $d/bin/xml2-config; then @@ -399,18 +395,11 @@ dnl AC_OUTPUT([ Makefile yaz.spec +src/Makefile +test/Makefile util/Makefile -odr/Makefile -z39.50/Makefile -ill/Makefile -zutil/Makefile -comstack/Makefile -ccl/Makefile -cql/Makefile -server/Makefile include/Makefile include/yaz/Makefile -lib/Makefile client/Makefile ztest/Makefile zoom/Makefile @@ -423,4 +412,4 @@ doc/tkl.xsl doc/yazhtml.xsl etc/Makefile 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]) +],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])