dnl YAZ Toolkit, Index Data 1994-2002
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.88 2002-09-16 14:16:31 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.9.1)
dnl
],[
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
],[
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
],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 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 <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_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>
-],
- [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 <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])
include/Makefile
include/yaz/Makefile
lib/Makefile
-zoom/Makefile
client/Makefile
ztest/Makefile
+zoom/Makefile
doc/Makefile
doc/yaz.xml
doc/yazhtml.dsl