Fix --static-pcap-only test on Solaris 10.

(Same as in tcpdump.)

Before:

checking for pcap-config... ../libpcap/pcap-config
grep: illegal option -- q
Usage: grep -hblcnsviw pattern file . . .
checking for pcap_loop... no
configure: error: This is a bug, please follow...

After:

checking for pcap-config... ../libpcap/pcap-config
checking for pcap_loop... yes

diff --git a/CHANGES b/CHANGES
index c5a6465d6323c62d55b78f727e870619ec6cacf3..61bfcc1e8f303d1aed38d618726b296142e28cf5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ v1.7 ...
 - Do the version number the same way as in tcpdump and libpcap.
 - Lose unused missing/strlcpy.c.
 - Use posix_fadvise() on input files if available.
+- Fix --static-pcap-only test on Solaris 10.
 
 v1.6 Thu 20 Oct 21:22:28 BST 2022
 

diff --git a/aclocal.m4 b/aclocal.m4
index 79d1e7e53404c20619696c7d7977d13cdcb3f557..7306aa0851fb41ac12465d5c27dbd676e3b1e5a3 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -580,7 +580,7 @@ AC_DEFUN(AC_LBL_LIBPCAP,
             # statically linked, and provide only the direct
             # dependencies with --static-pcap-only.
             #
-            if grep -s -q "static-pcap-only" "$PCAP_CONFIG"
+            if grep "static-pcap-only" "$PCAP_CONFIG" >/dev/null 2>&1
             then
                 static_opt="--static-pcap-only"
             else