From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 22 Mar 2016 12:59:27 +0000 (-0400)
Subject: Merge pull request #358 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to... 
X-Git-Tag: 3.0.0-233~517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=385db953c6aa218c99d3abddcca5f5332da3f7ea;p=thirdparty%2Fsnort3.git

Merge pull request #358 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to master

Squashed commit of the following:

commit b8be88308fa7665a00c7af2a1e9beacddb15b830
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Mar 21 19:38:38 2016 -0400

    configure: Propagate code coverage CPPFLAGS to the snort2lua build.
---

diff --git a/configure.ac b/configure.ac
index c4f9a87ca..206b9b677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1030,8 +1030,6 @@ AM_CONDITIONAL([HAVE_HYPERSCAN], [test "x$HS_HEADERS" = "xyes" -a "x$HS_LIB" = "
 
 AC_DEFINE_UNQUOTED([API_OPTIONS], ["$API_OPTIONS"], [plugin api related build options])
 
-snort2lua_CPPFLAGS='-I$(top_builddir) -I$(top_srcdir)/tools/snort2lua'
-
 if test -n "$ASAN_CCXFLAGS" ; then
     CFLAGS="$ASAN_CCXFLAGS $CFLAGS"
     CXXFLAGS="$ASAN_CCXFLAGS $CXXFLAGS"
@@ -1043,13 +1041,16 @@ if test "x${CODE_COVERAGE_ENABLED}" = "xyes" ; then
 fi
 
 # Global defaults for AM_* flags.  Can be overridden on a per-Makefile.am basis.
-AM_CPPFLAGS='-I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src \
-    -I$(top_srcdir)/src/network_inspectors'
-AM_CPPFLAGS+=" ${CODE_COVERAGE_CPPFLAGS}"
+AM_CPPFLAGS='-I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/network_inspectors'
+AM_CPPFLAGS="${AM_CPPFLAGS} ${CODE_COVERAGE_CPPFLAGS}"
 AM_CFLAGS="${CODE_COVERAGE_CFLAGS}"
 AM_CXXFLAGS="${CODE_COVERAGE_CXXFLAGS}"
 AM_LDFLAGS="${CODE_COVERAGE_LDFLAGS}"
 
+# Special AM_CPPFLAGS for snort2lua.
+snort2lua_CPPFLAGS='-I$(top_builddir) -I$(top_srcdir)/tools/snort2lua'
+snort2lua_CPPFLAGS="${snort2lua_CPPFLAGS} ${CODE_COVERAGE_CPPFLAGS}"
+
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_CXXFLAGS)