X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=a7175384d863e019dd629bb45b317fd03d12a3a1;hp=6c785e6d2e956f805937ecde016aaf7722ea66b3;hb=2979c8fc3b5c53c06facad850dcae09645b43044;hpb=1251332183cc7eb0177c09c12d5c6f003192398e

diff --git a/configure.ac b/configure.ac
index 6c785e6..a717538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-dnl YAZ Toolkit, Index Data 1995-2007
+dnl YAZ Toolkit, Index Data 1995-2008
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.101 2007-12-30 22:04:12 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.18],[yaz-help@indexdata.dk])
+dnl $Id: configure.ac,v 1.109 2008-01-28 08:14:52 adam Exp $
+AC_PREREQ(2.60)
+AC_INIT([yaz],[3.0.24],[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)
@@ -177,46 +177,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])
-
-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
-	PCAP_LIBS="-lpcap"
-	if test "$PCAP_DIR" != "/usr"; then
-	    PCAP_LIBS="-L$PCAP_DIR $PCAP_LIBS"
-	    PCAP_CFLAGS="-I$PCAP_DIR"
-	fi
-    else
-	oldLibs=$LIBS
-	AC_CHECK_LIB([pcap], [main])
-	if test "$ac_cv_lib_pcap_main" = "yes"; then
-	    AC_CHECK_HEADER([pcap.h])
-	    if test "$ac_cv_header_pcap_h" = "yes"; then
-		PCAP_LIBS="-lpcap"
-	    fi
-	fi
-	LIBS=$oldLibs
-    fi
-fi
-AC_MSG_CHECKING([for libpcap (required for ziffy)])
-if test -z "${PCAP_LIBS}"; then
-    AC_MSG_RESULT([not found. ziffy disabled])
-    if test "${PCAP_DIR}" = "yes"; then
-        AC_MSG_ERROR([libpcap missing])
-    fi
-else
-    AC_MSG_RESULT([found in $PCAP_DIR])
-    ZIFFY_PROG=ziffy
-fi
-
 dnl ------ various functions
 AC_CHECK_FUNCS(getaddrinfo vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
 case $host in
@@ -312,9 +272,6 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 fi
 dnl
 AC_SUBST(YAZ_CONFIG_CFLAGS)
-dnl
-dnl 
-AC_CHECK_ICU([3.6],[ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"])
 dnl ------ GNU threads
 HAVETHREADS=0
 AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
@@ -362,10 +319,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
     ]
 )
 
@@ -389,6 +348,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
@@ -419,7 +388,6 @@ include/yaz/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
-ziffy/Makefile
 doc/Makefile
 doc/local.ent
 doc/common/Makefile