X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=304d3f19349aadd851cb05dcbb6f37b7b3867cf8;hp=e1a081bda51923ae1c548f30e7c46ecbec80a6ea;hb=d940392c53c32ccf76fb287cc5b997b9e921a431;hpb=160e2c7f352ccad6728f1f972f373e862cee8644

diff --git a/configure.ac b/configure.ac
index e1a081b..304d3f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,10 @@
-dnl YAZ Toolkit, Index Data 1995-2007
-dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.77 2007-05-07 07:17:29 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.1],[yaz-help@indexdata.dk])
+dnl This file is part of the YAZ toolkit.
+dnl Copyright (C) 1995-2008 Index Data
+AC_PREREQ(2.60)
+AC_INIT([yaz],[3.0.28],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9])
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
@@ -14,7 +13,7 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_CHECK_PROGS(YACC, 'bison -y')
 test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
-AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh)
+AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
@@ -177,49 +176,6 @@ if test "$with_iconv" != "no"; then
 	    ])
     ])
 fi
-dnl ------ libpcap / ziffy
-
-AC_SUBST(ZIFFY_PROG)
-AC_SUBST(PCAP_LIBS)
-AC_SUBST(PCAP_CFLAGS)
-ZIFFY_PROG=
-AC_ARG_WITH(pcap, [  --with-pcap[=DIR]         libpcap root dir located in (dir)], [PCAP_DIR="$withval"],[PCAP_DIR=default])
-
-AC_MSG_CHECKING([for libpcap (required for ziffy)])
-if test "${PCAP_DIR}" != "no"; then
-    if test "${ac_cv_header_netinet_if_ether_h}" = "no"; then
-	:
-    elif test "${PCAP_DIR}" != "yes" && test "${PCAP_DIR}" != "default"; then
-	if test -r $PCAP_DIR/libpcap.a && test -r $PCAP_DIR/pcap.h; then
-	    PCAP_DIR="$PCAP_DIR"
-	    PCAP_LIBS="${LIBS} -L$PCAP_DIR -lpcap"
-	    PCAP_CFLAGS="${INCS} -I$PCAP_DIR"
-	    ZIFFY_PROG=ziffy
-	fi
-    elif test -d /usr/local &&
-	test -r /usr/local/lib/libpcap.a &&
-	test -r /usr/local/include/pcap.h; then
-	PCAP_DIR="/usr/local"
-	PCAP_LIBS="${LIBS} -L$PCAP_DIR/lib -lpcap"
-	PCAP_CFLAGS="${INCS} -I$PCAP_DIR/include"
-	ZIFFY_PROG=ziffy
-    elif test -d /usr &&
-	test -r /usr/lib/libpcap.a &&
-	test -r /usr/include/pcap.h; then
-	PCAP_DIR="/usr"
-	PCAP_LIBS="${LIBS} -lpcap"
-	ZIFFY_PROG=ziffy
-    fi
-fi
-if test -z "$ZIFFY_PROG"; then
-    AC_MSG_RESULT([not found. ziffy disabled])
-    if test "${PCAP_DIR}" != "default" && test "${PCAP_DIR}" != "no"; then
-        AC_MSG_ERROR([libpcap missing])
-    fi
-else
-    AC_MSG_RESULT([found in $PCAP_DIR])
-fi
-
 dnl ------ various functions
 AC_CHECK_FUNCS(getaddrinfo vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
 case $host in
@@ -295,7 +251,7 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 	CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
     fi
     AC_MSG_CHECKING(for working tcpd.h)
-    LIBS="$LIBS -lwrap -lnsl"
+    LIBS="$LIBS -lwrap"
     AC_TRY_LINK([#include <syslog.h>
 #include <tcpd.h>
 	    int allow_severity = LOG_INFO;
@@ -315,10 +271,8 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 fi
 dnl
 AC_SUBST(YAZ_CONFIG_CFLAGS)
-dnl
-HAVETHREADS=0
-dnl
 dnl ------ GNU threads
+HAVETHREADS=0
 AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
 AC_SUBST(LIBPTH)
 if test "$enable_pth" = "yes"; then
@@ -364,10 +318,12 @@ fi
 dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
 
+xml_enabled=false
 YAZ_LIBXML2(
     [
 	AC_DEFINE(YAZ_HAVE_XML2) 
 	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1"
+	xml_enabled=true
     ]
 )
 
@@ -391,6 +347,16 @@ if test "$XML2_LIBS"; then
 fi
 
 dnl
+dnl 
+AC_CHECK_ICU([3.6],[
+	if test "$xml_enabled" = "true"; then
+	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
+	else
+	    ICU_CPPFLAGS=""
+	    AC_MSG_WARN([ICU support disabled because XML support is unavailable])
+	fi
+])
+dnl
 dnl ------ Memory debugging
 AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
 if test "$enable_memdebug" = "yes"; then
@@ -404,6 +370,9 @@ AC_SUBST(YAZ_SRC_ROOT)
 AC_SUBST(YAZ_BUILD_ROOT)
 YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZ_BUILD_ROOT=`pwd`
+
+dnl ------ windows version files
+WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1
 dnl
 dnl ------ Makefiles
 dnl
@@ -418,7 +387,6 @@ include/yaz/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
-ziffy/Makefile
 doc/Makefile
 doc/local.ent
 doc/common/Makefile
@@ -427,7 +395,10 @@ etc/Makefile
 yaz-config
 yaz.pc
 Doxyfile
-],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
+],[
+	sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
+    ]
+)
 
 
 echo \