-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.73 2002-05-13 14:13:37 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)
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
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
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)
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
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])
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 <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/socket.h>
+],
+ [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 <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/socket.h>
+],
+ [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])
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([
include/Makefile
include/yaz/Makefile
lib/Makefile
-zoom/Makefile
client/Makefile
ztest/Makefile
+zoom/Makefile
doc/Makefile
doc/yaz.xml
doc/yazhtml.dsl