From: Victor Julien <vjulien@oisf.net>
Date: Mon, 10 Mar 2025 09:01:04 +0000 (+0100)
Subject: pcap: skip pcap-config if pkgconfig in use
X-Git-Tag: suricata-8.0.0-beta1~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=559e4ce062feca583bb8b609894292df17e66213;p=thirdparty%2Fsuricata.git

pcap: skip pcap-config if pkgconfig in use
---

diff --git a/configure.ac b/configure.ac
index b13820443e..88c64762ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1241,14 +1241,15 @@
         PCAP_LIB_NAME="pcap"
     fi
 
-    PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:])
-
-    AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no")
-    if test "$HAVE_PCAP_CONFIG" = "no" -o "$cross_compiling" = "yes"; then
-        AC_MSG_RESULT(no pcap-config is use)
-    else
-        PCAP_CFLAGS="$(pcap-config --defines) $(pcap-config --cflags)"
-        AC_SUBST(PCAP_CFLAGS)
+    PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}" with_pkgconfig_pcap=yes],[with_pkgconfig_pcap=no])
+    if test "$with_pkgconfig_pcap" != "yes"; then
+        AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no")
+        if test "$HAVE_PCAP_CONFIG" = "no" -o "x$cross_compiling" = "xyes"; then
+            AC_MSG_RESULT(no pcap-config is use)
+        else
+            PCAP_CFLAGS="$(pcap-config --defines) $(pcap-config --cflags)"
+            AC_SUBST(PCAP_CFLAGS)
+        fi
     fi
 
     #Appears as if pcap_set_buffer_size is linux only?