dnl YAZ Toolkit, Index Data 1994-2001
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.77 2002-07-05 12:42:52 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8.7)
+AM_INIT_AUTOMAKE(yaz, 1.8.8dev)
dnl
AC_SUBST(READLINE_LIBS)
+AC_SUBST(YAZ_CONF_CFLAGS)
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
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
+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])
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)
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([