dnl YAZ Toolkit, Index Data 1994-2004
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.148 2004-08-06 08:31:02 adam Exp $
+dnl $Id: configure.in,v 1.156 2004-10-03 22:34:07 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.22)
+AM_INIT_AUTOMAKE(yaz, 2.0.26)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
dnl
dnl ------ OpenSSL
openssl=no
-AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
+AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
USE_SSL=0
SSL_CFLAGS=""
SSL_LIBPATH=""
#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))
+ ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
LIBS=$xLIBS
fi
dnl ------ iconv
-AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX])
+AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX])
if test "$with_iconv" != "no"; then
AC_MSG_CHECKING(for iconv)
oldLIBS="$LIBS"
AC_TRY_LINK([
#include <iconv.h>
],[
- static void f() {iconv_t t = iconv_open("", ""); }
+ iconv_t t = iconv_open("", "");
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
AC_TRY_LINK([
#include <iconv.h>
],[
- static void f() {iconv_t t = iconv_open("", ""); }
+ iconv_t t = iconv_open("", "");
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
dnl
dnl ------ tcpd
AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
-if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
+if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
oldLibs=$LIBS
oldCPPFLAGS=$CPPFLAGS
if test "$enable_tcpd" != "yes"; then
tcpd_ok=1, tcpd_ok=0)
if test "$tcpd_ok" = "0"; then
AC_MSG_RESULT(no)
+ AC_MSG_ERROR([tcpd development libraries missing])
LIBS=$oldLibs
CPPFLAGS=$oldCPPFLAGS
else
dnl ----- libXML2
AC_SUBST(XML2_LIBS)
AC_SUBST(XML2_CFLAGS)
-xml2dir=yes
-AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval])
-if test "$xml2dir" = "yes"; then
+xml2dir=default
+AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval])
+if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; then
for d in /usr /usr/local; do
if test -x $d/bin/xml2-config; then
xml2dir=$d
AC_MSG_RESULT($XML2_VER)
AC_DEFINE(HAVE_XML2)
else
- AC_MSG_RESULT(Not found)
+ AC_MSG_RESULT([Not found])
+ if test "$xml2dir" != "default"; then
+ AC_MSG_ERROR([libXML2 development libraries missing])
+ fi
fi
fi
dnl
doc/yazhtml.xsl
etc/Makefile
yaz-config
+Doxyfile
],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])