X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=84119e4a99f8234e07c6aefa081cafa4a30b9af6;hp=41bddf97c756492fb5ae88872c579435eafca8b7;hb=4f8ea8cfaf2f3d95e4efcf9494526c2b4be43eb8;hpb=5fb7fa9318c6ea4a6aeecd515cc00fcd46709a3d

diff --git a/configure.ac b/configure.ac
index 41bddf9..84119e4 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.48 2006-11-29 22:35:17 adam Exp $
+dnl $Id: configure.ac,v 1.59 2007-01-24 10:09:31 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.41],[yaz-help@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])
@@ -23,7 +23,7 @@ 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 netinet/if_ether.h netinet/in_systm.h)
+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/times.h sys/types.h sys/un.h sys/wait.h unistd.h netinet/if_ether.h netinet/in_systm.h)
 AC_HEADER_STDC
 if test "$ac_cv_header_stdc" = "no"; then
     AC_MSG_WARN([Your system doesn not seem to support ANSI C])
@@ -163,35 +163,47 @@ if test "$with_iconv" != "no"; then
 	    ])
     ])
 fi
-dnl ------ libpcap
+dnl ------ libpcap / ziffy
 
+AC_SUBST(ZIFFY_PROG)
 AC_SUBST(PCAP_LIBS)
 AC_SUBST(PCAP_CFLAGS)
-AC_ARG_WITH(pcap-dir, [  --with-pcap-dir         libpcap root dir located in (dir)], PCAP_DIR="$withval", PCAP_DIR=no)
+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" &&
-    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"
-    AC_MSG_RESULT([found in $PCAP_DIR])
-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"
-    AC_MSG_RESULT([found in $PCAP_DIR])
-elif test -d /usr &&
-    test -r /usr/lib/libpcap.a &&
-    test -r /usr/include/pcap.h; then
-    PCAP_DIR="/usr"
-    PCAP_LIBS="${LIBS} -lpcap"
-    AC_MSG_RESULT([found in $PCAP_DIR])
-else
+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
@@ -416,6 +428,7 @@ 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])