-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.68 2002-03-25 15:12:25 adam Exp $
+dnl $Id: configure.in,v 1.85 2002-09-10 20:56:34 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)
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
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)
CFLAGS="$xCFLAGS"
fi
AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
+dnl
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
if test "$ac_cv_lib_readline_readline" = "yes"; then
AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+ xLIBS=$LIBS
+ LIBS="$LIBS $READLINE_LIBS"
+ AC_TRY_LINK([
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ],[
+ static void f()
+ {
+ rl_attempted_completion_over = 0;
+ }
+ ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
+ AC_TRY_LINK([
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ],[
+ static void f()
+ {
+ rl_completion_matches (0, 0);
+ }
+ ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
+ LIBS=$xLIBS
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 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)
+fi
+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>
+],
+ [getpeername(0, (struct sockaddr *)NULL, (size_t *)0);],
+ 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
dnl
dnl ------ tcpd
AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
fi
dnl
dnl ------ Headers
-AC_CHECK_HEADERS(fnmatch.h)
+AC_CHECK_HEADERS(fnmatch.h iconv.h)
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = "no"; then
AC_MSG_WARN(Your system doesn't seem to support ANSI C)
thread_ok=yes,thread_ok=no)
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT(yes)
- LIBTHREAD=-lpthread
+ LIBTHREAD="-lpthread"
CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
HAVETHREADS=1
else
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT([yes,BSD])
CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+ LIBTHREAD="-pthread"
HAVETHREADS=1
fi
fi
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([