If we have a local libpcap, add it to the dependencies for tcpdump.

We weren't doing so if we found a local pcap-config script.

2 files changed, 12 insertions, 4 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 401a06f4..580e0d47 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -593,7 +593,12 @@ AC_DEFUN(AC_LBL_LIBPCAP,
         fi
     else
         #
-        # We found a local libpcap.
+        # We found a local libpcap.  Add it to the dependencies for
+        # tcpdump.
+        #
+        $1=$libpcap
+
+        #
         # Look for its pcap-config script.
         #
         AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $local_pcap_dir)
@@ -618,7 +623,6 @@ AC_DEFUN(AC_LBL_LIBPCAP,
             # It doesn't have a pcap-config script.
             # Make sure it has a pcap.h file.
             #
-            $1=$libpcap
             places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
                 egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
             places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
diff --git a/configure b/configure
index 58666c63..70724a2f 100755
--- a/configure
+++ b/configure
@@ -5515,7 +5515,12 @@ $as_echo "found -- -I$d added" >&6; }
         fi
     else
         #
-        # We found a local libpcap.
+        # We found a local libpcap.  Add it to the dependencies for
+        # tcpdump.
+        #
+        V_PCAPDEP=$libpcap
+
+        #
         # Look for its pcap-config script.
         #
         # Extract the first word of "pcap-config", so it can be a program name with args.
@@ -5579,7 +5584,6 @@ fi
             # It doesn't have a pcap-config script.
             # Make sure it has a pcap.h file.
             #
-            V_PCAPDEP=$libpcap
             places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
                 egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
             places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \