Check for libpcap in directories under $srcdir, so that if you're

doing the compile in a directory other than the source directory, by
using the "--srcdir=" option, it finds libpcap if it's in a directory at
the same level as the tcpdump source directory or in a libpcap
subdirectory of that directory.

diff --git a/aclocal.m4 b/aclocal.m4
index 1c9067d0e0ddb120b81afcb559c93459f8a3fe2c..bc1e6399a53007d370a00a4db00248ab9c517ca9 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.93 2003-02-12 10:17:08 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.94 2003-03-13 08:04:25 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.
@@ -236,9 +236,9 @@ AC_DEFUN(AC_LBL_LIBPCAP,
     AC_MSG_CHECKING(for local pcap library)
     libpcap=FAIL
     lastdir=FAIL
-    places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \
+    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
        egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
-    for dir in $places ../libpcap libpcap ; do
+    for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
            basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//'`
            if test $lastdir = $basedir ; then
                    dnl skip alphas when an actual release is present

diff --git a/configure b/configure
index 5f803affbb13ce74c17b5d66ec1377f502d09bec..1fbb2a573129a2355c72b70a8ddfe805edd5655d 100755 (executable)
--- a/configure
+++ b/configure
@@ -3865,9 +3865,9 @@ done
 echo "configure:3866: checking for local pcap library" >&5
     libpcap=FAIL
     lastdir=FAIL
-    places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \
+    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
        egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
-    for dir in $places ../libpcap libpcap ; do
+    for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
            basedir=`echo $dir | sed -e 's/[ab][0-9]*$//'`
            if test $lastdir = $basedir ; then
                                    continue;