From ba9c557bfcaadc75e7d06dd44e75ba55cf727bf8 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 1 Oct 2014 11:39:42 +0200
Subject: [PATCH] Don't add includes to both CPPFLAGS and CXXFLAGS

---
 configure.ac     | 1 -
 pdns/Makefile.am | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e2814b5b4..8ce433b7f 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 7334fed3f..00ca9fce5 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
-- 
2.49.0