From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 6 Dec 2011 03:36:08 +0000 (+0000)
Subject: Move BOOST_CPPFLAGS into main flags
X-Git-Tag: 1.5.0~57
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=6648b103b2a2513c4df5cfa8027047da92cda506

Move BOOST_CPPFLAGS into main flags
---

diff --git a/configure.ac b/configure.ac
index 0a47407..c407691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,7 @@ BOOST_LAMBDA
 BOOST_PTR_CONTAINER
 BOOST_STRING_ALGO
 BOOST_TOKENIZER
+CPPFLAGS = "$BOOST_CPPFLAGS $CPPFLAGS"
 
 # are covariant methods allowed?
 AC_LINK_IFELSE(
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 6468749..f162795 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -203,14 +203,13 @@ common_sources = \
 
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
-libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE $(BOOST_CPPFLAGS)
+libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
 libxmltooling_lite_la_LDFLAGS = -version-info 6:0:0
 
 if BUILD_XMLSEC
 libxmltooling_la_SOURCES = \
 	${common_sources} \
 	${xmlsec_sources}
-libxmltooling_la_CPPFLAGS = $(BOOST_CPPFLAGS)
 libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
 endif