summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-01-22 21:33:21 -0800
committerGuy Harris <guy@alum.mit.edu>2018-01-22 21:33:21 -0800
commite325894a353f221ae60cd7c6d71f6688f4c00453 (patch)
tree43953475ba53ff4f3cc068d93f514bbc26a0b944 /aclocal.m4
parent27f68cf1a8e29c13bade1a07da0e5015f6d5a7fe (diff)
downloadtcpdump-e325894a353f221ae60cd7c6d71f6688f4c00453.tar.gz
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.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m48
1 files changed, 6 insertions, 2 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,^,../," | \