From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Mon, 29 Jun 2015 14:04:14 +0000 (+0200)
Subject: Disable pcap-config use during cross compilation
X-Git-Tag: suricata-3.0RC1~283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91efdadf8e871662a6bc4cfad0a21d707a31eded;p=thirdparty%2Fsuricata.git

Disable pcap-config use during cross compilation

This allows cross compilation where the host system has pcap-config
installed and would create an invalid entry in the cross-CFLAGS.
---

diff --git a/configure.ac b/configure.ac
index 9372052098..fb3c363a3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -961,7 +961,7 @@
     AC_CHECK_LIB(pcap, pcap_activate,, LPCAPVTEST="no")
     if test "$LPCAPVTEST" != "no"; then
         AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no")
-        if test "$HAVE_PCAP_CONFIG" = "no"; then
+        if test "$HAVE_PCAP_CONFIG" = "no" -o "$cross_compiling" = "yes"; then
             CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1"
         else
             CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1"