Set BOOST_CPPFLAGS and THREADFLAGS globally

Should fix #1523

diff --git a/configure.ac b/configure.ac
index 9028cfe7b73b790abb337c375db31cd4854f8428..d7d27ff8d1aa199ab54566045fab6aeba5c6fed9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -345,7 +345,9 @@ LDFLAGS="$LDFLAGS $RELRO_LDFLAGS"
 
 AC_SUBST(LIBS)
 
-AC_SUBST([AM_CPPFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
+AC_SUBST([AM_CPPFLAGS],
+  ["AS_ESCAPE([-I$(top_builddir) -I$(top_srcdir)]) $THREADFLAGS $BOOST_CPPFLAGS"]
+)
 
 export moduledirs moduleobjects modulelibs
 

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index caa66a4681cf1d1254466562a9052f2a766bec9d..0db77851801643ff018f34e76c7a8ad82d11a808 100644 (file)
--- a/modules/bindbackend/Makefile.am
+++ b/modules/bindbackend/Makefile.am
@@ -1,5 +1,5 @@
 pkglib_LTLIBRARIES = libbindbackend.la
-AM_CPPFLAGS=-I../../pdns $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) $(THREADFLAGS)
+AM_CPPFLAGS += -I../../pdns $(POLARSSL_CFLAGS)
 
 AM_LFLAGS = -i
 AM_YFLAGS = -d --verbose --debug

diff --git a/modules/db2backend/Makefile.am b/modules/db2backend/Makefile.am
index 84b06f6ae14ce2c4044d4c1b08e54e663498741e..6d4c06d867ca2c9fd7c8d9255135b1007d419f3b 100644 (file)
--- a/modules/db2backend/Makefile.am
+++ b/modules/db2backend/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
 pkglib_LTLIBRARIES = libdb2backend.la
 
 libdb2backend_la_SOURCES=DB2Backend.cc DB2Backend.hh DB2Exception.cc DB2Exception.hh

diff --git a/modules/geobackend/Makefile.am b/modules/geobackend/Makefile.am
index 7b447b842c188e65bbd282f936d7c6267d39a539..b562227942459e4cc2e38ef6d835da47ae02d3bc 100644 (file)
--- a/modules/geobackend/Makefile.am
+++ b/modules/geobackend/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 pkglib_LTLIBRARIES = libgeobackend.la
 libgeobackend_la_SOURCES=geobackend.cc geobackend.hh ippreftree.cc ippreftree.hh

diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am
index ee8cdaa4b1ed0693f9b3d360415c719d271bb113..8e7716897169776fcbee1537eb4d2aa28eeaa03d 100644 (file)
--- a/modules/geoipbackend/Makefile.am
+++ b/modules/geoipbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(THREADFLAGS) $(BOOST_CPPFLAGS) $(YAML_CFLAGS) $(GEOIP_CFLAGS)
+AM_CPPFLAGS += $(YAML_CFLAGS) $(GEOIP_CFLAGS)
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 pkglib_LTLIBRARIES = libgeoipbackend.la
 libgeoipbackend_la_SOURCES = geoipbackend.cc geoipbackend.hh

diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 694bfe6218b94114ab3ec65046ec4e306865dadb..d49a73b813b636d35ee0948cd5b1d61a1c4cacd8 100644 (file)
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(MYSQL_inc) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(MYSQL_inc)
 pkglib_LTLIBRARIES = libgmysqlbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \

diff --git a/modules/goraclebackend/Makefile.am b/modules/goraclebackend/Makefile.am
index 84bce5a545a051bea2821a402a9283c72f9f6d2e..a6e5d80f235811231d27d9a9b3513180b6fd8bee 100644 (file)
--- a/modules/goraclebackend/Makefile.am
+++ b/modules/goraclebackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(ORACLE_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(ORACLE_CFLAGS)
 pkglib_LTLIBRARIES = libgoraclebackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \

diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index 44af5e04cc50ada15be8c810595d6e78c2bf6993..15710df385f759dcf6c71cfcdc6f5ad3eb12aaf2 100644 (file)
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(PGSQL_inc) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(PGSQL_inc)
 pkglib_LTLIBRARIES = libgpgsqlbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \

diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am
index f4725393f519fbbd026c186108c19bd462445420..0abc7ad10c4e6328cac7f4e77f9c6df9999d4160 100644 (file)
--- a/modules/gsqlite3backend/Makefile.am
+++ b/modules/gsqlite3backend/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
 pkglib_LTLIBRARIES = libgsqlite3backend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \

diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am
index 016fcf9d1fd171b15ef045e32af40ad255a0dd1d..dae1cbb44886eea825df98ecc1a69e4d4816aa5e 100644 (file)
--- a/modules/ldapbackend/Makefile.am
+++ b/modules/ldapbackend/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
-
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
 pkglib_LTLIBRARIES = libldapbackend.la

diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am
index 924e00a3e857eb77408c1f21416968b4fe1a47d8..87e9eb4c2988346c3f91c59c67eff7ed115a6648 100644 (file)
--- a/modules/lmdbbackend/Makefile.am
+++ b/modules/lmdbbackend/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
 pkglib_LTLIBRARIES = liblmdbbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS

diff --git a/modules/luabackend/Makefile.am b/modules/luabackend/Makefile.am
index 90e53b3d46b6b01ec782c80bed6e3f2a8599d41e..aab3d65e7c1c50cb897d288c68b7a8fb1de81b96 100644 (file)
--- a/modules/luabackend/Makefile.am
+++ b/modules/luabackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(LUA_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(LUA_CFLAGS)
 #AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT $(THREADFLAGS)
 EXTRA_DIST=OBJECTFILES OBJECTLIBS 
 

diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am
index 0363f82caae61b58f66ee34adc2f6719f2ea170b..582b563034397dbcaa6531301ce1ab6ea052aa3d 100644 (file)
--- a/modules/mydnsbackend/Makefile.am
+++ b/modules/mydnsbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(MYSQL_inc) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(MYSQL_inc)
 pkglib_LTLIBRARIES = libmydnsbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS \

diff --git a/modules/opendbxbackend/Makefile.am b/modules/opendbxbackend/Makefile.am
index 8092b914ee8c56a9a2da3174920ded29374fdba5..ef97ab46e6e6696e161b45e3dfa036a499c33ff0 100644 (file)
--- a/modules/opendbxbackend/Makefile.am
+++ b/modules/opendbxbackend/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
-
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
 pkglib_LTLIBRARIES = libopendbxbackend.la

diff --git a/modules/oraclebackend/Makefile.am b/modules/oraclebackend/Makefile.am
index 4d77138cf67a93080bed2a19c9ebb8a89b38d1aa..9690ba207caf856edd8b4fb5cabee0a243c9367e 100644 (file)
--- a/modules/oraclebackend/Makefile.am
+++ b/modules/oraclebackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(ORACLE_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(ORACLE_CFLAGS)
 
 pkglib_LTLIBRARIES = liboraclebackend.la
 

diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am
index 0e8df89fd74fced7f48cc5cbc742318df3ccb203..a01fca977df0e462b96f4cabbf5bc1eb8ec6ab9b 100644 (file)
--- a/modules/pipebackend/Makefile.am
+++ b/modules/pipebackend/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
 #if !ALLSTATIC
 #install-exec-local:
 #      install .lib/libpipebackend.so.0.0.0 @libdir@

diff --git a/modules/randombackend/Makefile.am b/modules/randombackend/Makefile.am
index b4ff1e453ecf2c6e35068e20a3e8d63a51d23529..16e3250845c471f7f42e38d0f206f9bb36758f06 100644 (file)
--- a/modules/randombackend/Makefile.am
+++ b/modules/randombackend/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
-
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
 pkglib_LTLIBRARIES = librandombackend.la

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 22e3db45de617764da0fdfc6d6b15bb0a760955a..b6e4fb428298c3cf3d17653d03df6b53811d491f 100644 (file)
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -1,8 +1,6 @@
 AM_CPPFLAGS += \
-       $(THREADFLAGS) \
        -I../../pdns/ext/rapidjson/include \
        -I../../pdns/ext/yahttp \
-       $(BOOST_CPPFLAGS) \
        $(POLARSSL_CFLAGS) \
        $(LIBZMQ_CFLAGS)
 

diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index f0a4e84bf0b3d94a89af08ecb0954e62b5a40095..f137751eaeb7c8afc509e02db7f6b5515b2b91de 100644 (file)
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=$(CDB_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS += $(CDB_CFLAGS)
 pkglib_LTLIBRARIES = libtinydnsbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 6d2a6e96c09b0dc8b7179c7fa4c6291879fe8382..11f92921cbfd2fe297d08c4fd5ff05fa40ffe295 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,5 +1,5 @@
-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)
+AM_CPPFLAGS += -I$(top_srcdir)/pdns/ext/rapidjson/include -I$(top_srcdir)/pdns/ext/yahttp
+AM_CXXFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"$(socketdir)\" $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS)
 
 YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp