[cpp-xmltooling COMMIT] in /branches/REL_1: configure.ac xmltooling/Makefile.am

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec  6 03:36:08 2011
New Revision: 934

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=934&view=rev
Log:
Move BOOST_CPPFLAGS into main flags

Modified:
    branches/REL_1/configure.ac
    branches/REL_1/xmltooling/Makefile.am

Modified: branches/REL_1/configure.ac
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/configure.ac?rev=934&r1=933&r2=934&view=diff
==============================================================================
--- branches/REL_1/configure.ac (original)
+++ branches/REL_1/configure.ac Tue Dec  6 03:36:08 2011
@@ -101,6 +101,7 @@
 BOOST_PTR_CONTAINER
 BOOST_STRING_ALGO
 BOOST_TOKENIZER
+CPPFLAGS = "$BOOST_CPPFLAGS $CPPFLAGS"
 
 # are covariant methods allowed?
 AC_LINK_IFELSE(

Modified: branches/REL_1/xmltooling/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/Makefile.am?rev=934&r1=933&r2=934&view=diff
==============================================================================
--- branches/REL_1/xmltooling/Makefile.am (original)
+++ branches/REL_1/xmltooling/Makefile.am Tue Dec  6 03:36:08 2011
@@ -203,14 +203,13 @@
 
 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