-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.75 2002-05-22 14:27:17 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.8dev)
+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.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.* \
/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=no
-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])
],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 <iconv.h>
+ ],[
+ static void f() {iconv_t t = iconv_open("", ""); }
+ ],[
+ AC_DEFINE(HAVE_ICONV_H)
+ AC_MSG_RESULT(yes)
+ ],[
+ LIBS="$LIBS -liconv"
+ AC_TRY_LINK([
+ #include <iconv.h>
+ ],[
+ 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 <sys/types.h>
+ #include <sys/socket.h>
+ #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 <sys/types.h>
+ #include <sys/socket.h>
+ #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])
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