From a06bb3ab7af78c8ecb3f025729f16e0d796380d0 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 30 Nov 2006 08:46:52 +0000
Subject: [PATCH] Change --with-pcap-dir to --with-pcap[=DIR]. Enable ziffy
 only if libpcap is found.

---
 configure.ac      |   62 ++++++++++++++++++++++++++++++++---------------------
 ziffy/Makefile.am |   13 +++++------
 2 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index 41bddf9..bdcfd6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 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.49 2006-11-30 08:46:52 adam Exp $
 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.41],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -163,35 +163,49 @@ if test "$with_iconv" != "no"; then
 	    ])
     ])
 fi
-dnl ------ libpcap
+dnl ------ libpcap / ziffy
 
+AC_SUBST(ZIFFY_PROG)
+AC_SUBST(ZIFFY_MAN)
 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])
+    ZIFFY_MAN=ziffy.1
 fi
 
 dnl ------ various functions
diff --git a/ziffy/Makefile.am b/ziffy/Makefile.am
index 281e955..4b590ca 100644
--- a/ziffy/Makefile.am
+++ b/ziffy/Makefile.am
@@ -4,17 +4,18 @@
 ##
 ## Copyright (c) 1998-2001 R. Carbone <rocco@ntop.org>
 
-ziffy_LDADD     = ../src/libyaz.la $(PCAP_LIBS)
+ziffy_LDADD = ../src/libyaz.la $(PCAP_LIBS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(PCAP_CFLAGS) -DHAVE_YAZ=1
+AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_CFLAGS) -DHAVE_YAZ=1
 
-bin_PROGRAMS = ziffy
+bin_PROGRAMS = $(ZIFFY_PROG)
+EXTRA_PROGRAMS = ziffy
+
+man_MANS = $(ZIFFY_MAN)
+EXTRA_MANS = ziffy.1
 
-man_MANS = ziffy.1
 EXTRA_DIST = ANNOUNCEMENT-1 AUTHORS COPYING ChangeLog \
               FAQ FILES HACKING NEWS README TODO $(man_MANS)
 
 ziffy_SOURCES = ziffy.c yaz.c fmemdmp.c hooks.c apdu.c apdu.h
 
-
-
-- 
1.7.10.4