From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 7 Oct 2014 14:29:29 +0000 (+0200)
Subject: Set BOOST_CPPFLAGS and THREADFLAGS globally
X-Git-Tag: rec-3.7.0-rc1~210^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa35712576526b20b10b70d63329800aa616a6b8;p=thirdparty%2Fpdns.git

Set BOOST_CPPFLAGS and THREADFLAGS globally

Should fix #1523
---

diff --git a/configure.ac b/configure.ac
index 9028cfe7b7..d7d27ff8d1 100644
--- 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 caa66a4681..0db7785180 100644
--- 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 84b06f6ae1..6d4c06d867 100644
--- 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 7b447b842c..b562227942 100644
--- 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 ee8cdaa4b1..8e77168971 100644
--- 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 694bfe6218..d49a73b813 100644
--- 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 84bce5a545..a6e5d80f23 100644
--- 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 44af5e04cc..15710df385 100644
--- 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 f4725393f5..0abc7ad10c 100644
--- 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 016fcf9d1f..dae1cbb448 100644
--- 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 924e00a3e8..87e9eb4c29 100644
--- 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 90e53b3d46..aab3d65e7c 100644
--- 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 0363f82caa..582b563034 100644
--- 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 8092b914ee..ef97ab46e6 100644
--- 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 4d77138cf6..9690ba207c 100644
--- 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 0e8df89fd7..a01fca977d 100644
--- 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 b4ff1e453e..16e3250845 100644
--- 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 22e3db45de..b6e4fb4282 100644
--- 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 f0a4e84bf0..f137751eae 100644
--- 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 6d2a6e96c0..11f92921cb 100644
--- 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