Autoconf: Synchronize with tcpdump aclocal.m4.

Minimize the diff and update the change log.

diff --git a/CHANGES b/CHANGES
index 61bfcc1e8f303d1aed38d618726b296142e28cf5..ecefb6606e0fe0a9423aa6d33aa2e7f86610837c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,11 @@ v1.7 ...
 - Lose unused missing/strlcpy.c.
 - Use posix_fadvise() on input files if available.
 - Fix --static-pcap-only test on Solaris 10.
+- autoconf: replace --with-system-libpcap with --disable-local-libpcap.
+- autoconf: Find a local libpcap even with rcX directory suffix
+- configure: special-case macOS /usr/bin/pcap-config
+- On Solaris, for 64-bit builds, use the 64-bit pcap-config.
+- configure: don't use egrep, use $EGREP.
 
 v1.6 Thu 20 Oct 21:22:28 BST 2022
 

diff --git a/aclocal.m4 b/aclocal.m4
index 0ac978048e66c46fea28978bf7559d8dedcacfaf..2191392f0ed748ae8fd25320c3545f5882e37da3 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -98,6 +98,9 @@ AC_DEFUN(AC_LBL_C_INIT,
                    # This is assumed either to be GCC or clang, both
                    # of which use -Werror to force warnings to be errors.
                    #
+                   # XXX - they also both cause GCC to be set to yes,
+                   # so we should never get here in the first place.
+                   #
                    ac_lbl_cc_force_warning_errors=-Werror
                    ;;
 
@@ -174,7 +177,6 @@ AC_DEFUN(AC_LBL_C_INIT,
                    #
                    ac_lbl_cc_force_warning_errors=-errwarn
                    ;;
-
            esac
            $1="$$1 -O"
     fi
@@ -641,7 +643,6 @@ AC_DEFUN(AC_LBL_LIBPCAP,
             # routines in those libraries, so we'll need to link with
             # them, because we'll be linking statically with it.
             #
-            #
             # If it supports --static-pcap-only. use that, as we will be
             # linking with a static libpcap but won't be linking
             # statically with any of the libraries on which it depends;