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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov 16 21:33:55 2011
New Revision: 917

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=917&view=rev
Log:
Boost dependency support.

Added:
    branches/REL_1/m4/boost.m4
Modified:
    branches/REL_1/configure.ac
    branches/REL_1/xmltooling.spec.in
    branches/REL_1/xmltooling/Makefile.am
    branches/REL_1/xmltooling/XMLToolingConfig.cpp

Modified: branches/REL_1/configure.ac
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/configure.ac?rev=917&r1=916&r2=917&view=diff
==============================================================================
--- branches/REL_1/configure.ac (original)
+++ branches/REL_1/configure.ac Wed Nov 16 21:33:55 2011
@@ -89,6 +89,11 @@
 # C++ requirements
 AC_CXX_NAMESPACES
 AC_CXX_REQUIRE_STL
+
+# Boost
+BOOST_REQUIRE
+BOOST_STRING_ALGO
+BOOST_LAMBDA
 
 # are covariant methods allowed?
 AC_LINK_IFELSE(

Modified: branches/REL_1/xmltooling.spec.in
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling.spec.in?rev=917&r1=916&r2=917&view=diff
==============================================================================
--- branches/REL_1/xmltooling.spec.in (original)
+++ branches/REL_1/xmltooling.spec.in Wed Nov 16 21:33:55 2011
@@ -16,7 +16,7 @@
 BuildRequires:  libxml-security-c-devel >= 1.4.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
@@ -158,8 +158,9 @@
 %doc %{pkgdocdir}
 
 %changelog
-* Mon Aug 8 2011 Scott Cantor  <cantor.2 at osu.edu>  - 1.5-1
+* Mon Nov 14 2011 Scott Cantor  <cantor.2 at osu.edu>  - 1.5-1
 - Update lib package number.
+- Add boost-devel dependency.
 
 * Sun Jun 26 2011  Scott Cantor  <cantor.2 at osu.edu>  - 1.4.2-1
 - Override curl build for RHEL6.

Modified: branches/REL_1/xmltooling/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/Makefile.am?rev=917&r1=916&r2=917&view=diff
==============================================================================
--- branches/REL_1/xmltooling/Makefile.am (original)
+++ branches/REL_1/xmltooling/Makefile.am Wed Nov 16 21:33:55 2011
@@ -203,14 +203,15 @@
 
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
-libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
+libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE $(BOOST_CPPFLAGS)
 libxmltooling_lite_la_LDFLAGS = -version-info 6:0:0
 
 if BUILD_XMLSEC
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
 libxmltooling_la_SOURCES = \
 	${common_sources} \
 	${xmlsec_sources}
+libxmltooling_la_CPPFLAGS = $(BOOST_CPPFLAGS)
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
 endif
 
 install-exec-hook:

Modified: branches/REL_1/xmltooling/XMLToolingConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/XMLToolingConfig.cpp?rev=917&r1=916&r2=917&view=diff
==============================================================================
--- branches/REL_1/xmltooling/XMLToolingConfig.cpp (original)
+++ branches/REL_1/xmltooling/XMLToolingConfig.cpp Wed Nov 16 21:33:55 2011
@@ -675,7 +675,7 @@
         if (fn(context)!=0)
             throw runtime_error(string("detected error in xmltooling_extension_init in ") + resolved);
     }
-    catch(exception&) {
+    catch(std::exception&) {
         if (handle)
             dlclose(handle);
         throw;