X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=6dae362a0c7250c27d09e0acb6e8bba16371c726;hb=e310bbc88afee1090799a0183d75c35d5eb060d9;hp=1170ef33f095596deadfe8b0be43afb0a5193054;hpb=0ffb25b0bf78f53399267664b71206c88980c4da;p=yaz-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index 1170ef3..6dae362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1995-2007
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.95 2007-10-22 12:21:38 adam Exp $
+dnl $Id: configure.ac,v 1.102 2008-01-14 20:34:14 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.15],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.18],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -14,7 +14,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,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
@@ -314,10 +274,7 @@ dnl
 AC_SUBST(YAZ_CONFIG_CFLAGS)
 dnl
 dnl 
-AC_CHECK_ICU(3.6, [],
-    AC_MSG_WARN([For ICU internationalizing support please install libicu36-dev 
-    or similar]))
-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])
@@ -422,7 +379,6 @@ include/yaz/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
-ziffy/Makefile
 doc/Makefile
 doc/local.ent
 doc/common/Makefile