From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 1 Oct 2014 09:39:42 +0000 (+0200)
Subject: Don't add includes to both CPPFLAGS and CXXFLAGS
X-Git-Tag: rec-3.7.0-rc1~227^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1761%2Fhead;p=thirdparty%2Fpdns.git

Don't add includes to both CPPFLAGS and CXXFLAGS
---

diff --git a/configure.ac b/configure.ac
index e2814b5b48..8ce433b7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,7 +352,6 @@ LDFLAGS="$LDFLAGS $RELRO_LDFLAGS"
 AC_SUBST(LIBS)
 
 AC_SUBST([AM_CPPFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
-AC_SUBST([AM_CXXFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
 
 export moduledirs moduleobjects modulelibs
 
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 7334fed3fb..00ca9fce52 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,11 +1,11 @@
-AM_CXXFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"$(socketdir)\" $(THREADFLAGS) $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -I$(top_srcdir)/pdns/ext/rapidjson/include -I$(top_srcdir)/pdns/ext/yahttp
+AM_CPPFLAGS += $(BOOST_CPPFLAGS) $(THREADFLAGS) -I$(top_srcdir)/pdns/ext/rapidjson/include -I$(top_srcdir)/pdns/ext/yahttp
+AM_CXXFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"$(socketdir)\" $(THREADFLAGS) $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS)
 
 YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp
 
 AM_LFLAGS = -i
 AM_YFLAGS = -d --verbose --debug
 
-AM_CPPFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS)
 if BOTAN110
 AM_CPPFLAGS += $(BOTAN110_CFLAGS)
 endif