[cpp-sp] 08/17: Localize Boost preprocessor flags

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=aef9ebc8e0f58b3782c05c9b01b613c3671cdb36

commit aef9ebc8e0f58b3782c05c9b01b613c3671cdb36
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jul 14 15:07:06 2016 +0200

    Localize Boost preprocessor flags
---
 apache/Makefile.am     | 4 ++++
 configure.ac           | 1 -
 nsapi_shib/Makefile.am | 1 +
 odbc-store/Makefile.am | 1 +
 plugins/Makefile.am    | 1 +
 shibsp/Makefile.am     | 2 ++
 util/Makefile.am       | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 0818a0d..e244c38 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -7,6 +7,7 @@ mod_shib_13_la_SOURCES = mod_shib_13.cpp
 mod_shib_13_la_LDFLAGS = -module -avoid-version
 mod_shib_13_la_CXXFLAGS = \
   $(APXS_CFLAGS) -I$(APXS_INCLUDE) \
+  $(BOOST_CPPFLAGS) \
   $(PTHREAD_CFLAGS) \
   $(xmltooling_lite_CFLAGS)
 mod_shib_13_la_LIBADD = \
@@ -22,6 +23,7 @@ mod_shib_20_la_SOURCES = mod_shib_20.cpp
 mod_shib_20_la_LDFLAGS = -module -avoid-version
 mod_shib_20_la_CXXFLAGS = \
   $(APXS2_CFLAGS) -I$(APXS2_INCLUDE) \
+  $(BOOST_CPPFLAGS) \
   $(PTHREAD_CFLAGS) \
   $(xmltooling_lite_CFLAGS)
 mod_shib_20_la_LIBADD = \
@@ -37,6 +39,7 @@ mod_shib_22_la_SOURCES = mod_shib_22.cpp
 mod_shib_22_la_LDFLAGS = -module -avoid-version
 mod_shib_22_la_CXXFLAGS = \
   $(APXS22_CFLAGS) -I$(APXS22_INCLUDE) \
+  $(BOOST_CPPFLAGS) \
   $(PTHREAD_CFLAGS) \
   $(xmltooling_lite_CFLAGS)
 mod_shib_22_la_LIBADD = \
@@ -52,6 +55,7 @@ mod_shib_24_la_SOURCES = mod_shib_24.cpp
 mod_shib_24_la_LDFLAGS = -module -avoid-version
 mod_shib_24_la_CXXFLAGS = \
   $(APXS24_CFLAGS) -I$(APXS24_INCLUDE) \
+  $(BOOST_CPPFLAGS) \
   $(PTHREAD_CFLAGS) \
   $(xmltooling_lite_CFLAGS)
 mod_shib_24_la_LIBADD = \
diff --git a/configure.ac b/configure.ac
index 4994f4d..bf652e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,6 @@ BOOST_POINTER_CONTAINER
 BOOST_SMART_PTR
 BOOST_STRING_ALGO
 BOOST_TUPLE
-CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 
 # Thank you Solaris, really.
 AC_MSG_CHECKING(for ctime_r)
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 41f0ce9..1ca52ba 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -5,6 +5,7 @@ nsapi_shibdir = $(libdir)/@PACKAGE_NAME@
 nsapi_shib_LTLIBRARIES = nsapi_shib.la
 nsapi_shib_la_SOURCES = nsapi_shib.cpp
 nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE) \
+  $(BOOST_CPPFLAGS) \
   $(PTHREAD_CFLAGS) \
   $(xmltooling_lite_CFLAGS)
 nsapi_shib_la_LDFLAGS = -module -avoid-version
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index 37d1d9e..c5c2bc1 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -7,6 +7,7 @@ AM_CFLAGS = $(ODBC_CFLAGS)
 AM_CXXFLAGS = $(ODBC_CFLAGS)
 
 odbc_store_la_CXXFLAGS = \
+	$(BOOST_CPPFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(xmltooling_CFLAGS)
 odbc_store_la_LIBADD = $(XMLSEC_LIBS) $(ODBC_LIBS) \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2e21a2d..bd4ce1e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -37,6 +37,7 @@ plugins_lite_la_LIBADD = \
 plugins_la_LDFLAGS = -module -avoid-version
 plugins_lite_la_LDFLAGS = -module -avoid-version
 plugins_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+	$(BOOST_CPPFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(xmltooling_lite_CFLAGS)
 
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 8a6b4b7..0604491 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -244,6 +244,7 @@ libshibsp_la_SOURCES = \
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libshibsp_la_LDFLAGS = -version-info 8:0:0
 libshibsp_la_CXXFLAGS = \
+    $(BOOST_CPPFLAGS) \
     $(PTHREAD_CFLAGS) \
     $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
     $(xmltooling_CFLAGS)
@@ -254,6 +255,7 @@ libshibsp_la_LIBADD = \
     $(XMLSEC_LIBS)
 libshibsp_lite_la_LDFLAGS = -version-info 8:0:0
 libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+    $(BOOST_CPPFLAGS) \
     $(PTHREAD_CFLAGS) \
     $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
     $(xmltooling_lite_CFLAGS)
diff --git a/util/Makefile.am b/util/Makefile.am
index eb57958..6b758e8 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -5,6 +5,7 @@ bin_PROGRAMS = mdquery resolvertest
 resolvertest_SOURCES = resolvertest.cpp
 
 resolvertest_CXXFLAGS = \
+	$(BOOST_CPPFLAGS) \
 	$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
 	$(xmltooling_CFLAGS)
 resolvertest_LDADD = \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.