X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=6c4103ce9dbc7a90eee404f346a4e9e276b4c8d4;hp=1d1c580840dd73929c2f3fee76a9e89324cb2b2a;hb=e4ef95b2ccfe88d7049543664f00e5fda957dd0c;hpb=bb7daed8b7299999f1c25e4e768e5e510d4b7e98

diff --git a/configure.ac b/configure.ac
index 1d1c580..6c4103c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-dnl YAZ Toolkit, Index Data 1994-2006
+dnl YAZ Toolkit, Index Data 1995-2007
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.24 2006-06-13 15:36:09 adam Exp $
+dnl $Id: configure.ac,v 1.60 2007-02-20 09:53:30 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.21],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.49],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -16,7 +16,6 @@ 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_PROG_INSTALL
-AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
@@ -24,7 +23,18 @@ YAZ_DOC
 dnl 
 dnl
 dnl ------ Headers
-AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h sys/wait.h unistd.h)
+AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h netinet/in.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h])
+AC_CHECK_HEADERS([netinet/if_ether.h],[],[],[
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+])
 AC_HEADER_STDC
 if test "$ac_cv_header_stdc" = "no"; then
     AC_MSG_WARN([Your system doesn not seem to support ANSI C])
@@ -164,8 +174,51 @@ 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 "${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
+    else
+	if 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
+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(vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
+AC_CHECK_FUNCS(getaddrinfo vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
 case $host in
     *-*-darwin*)
 	trypoll="no";
@@ -322,10 +375,30 @@ fi
 
 dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
+AC_SUBST(YAZ_CONFIG_CFLAGS)
+YAZ_CONFIG_CFLAGS=""
 
-YAZ_LIBXML2
-YAZ_LIBXSLT
-YAZ_LIBEXSLT
+YAZ_LIBXML2(
+    [
+	AC_DEFINE(YAZ_HAVE_XML2) 
+	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1"
+    ]
+)
+
+YAZ_LIBXSLT(
+    [
+	AC_DEFINE(YAZ_HAVE_XSLT)
+	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1"
+    ]
+)
+YAZ_LIBEXSLT(
+    [
+	AC_DEFINE(YAZ_HAVE_EXSLT)
+	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1"
+    ]
+)
+	
+YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS"
 
 if test "$XML2_LIBS"; then
     LIBS="$XML2_LIBS $LIBS"
@@ -359,12 +432,14 @@ include/yaz/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
+ziffy/Makefile
 doc/Makefile
 doc/local.ent
 doc/common/Makefile
 doc/common/print.dsl
 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])