[cpp-opensaml] 08/19: Use pkg-config for xmlsec

[Scott Cantor]

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

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

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

commit 8f9d78963032fa6876c4b4b6a078a4cf51465f50
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Mon Jul 11 12:27:49 2016 +0200

    Use pkg-config for xmlsec
---
 configure.ac         | 26 +-------------------------
 saml/Makefile.am     |  2 ++
 samltest/Makefile.am |  2 ++
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index d8b40f3..099a0c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,31 +94,7 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
 # Xerces-C v2.6.0 has bugs that inhibit use with signed XML
 AX_PKG_CHECK_MODULES([xerces],,[xerces-c != 3.0])
 
-# XML-Security settings
-AC_ARG_WITH(xmlsec,
-    AS_HELP_STRING([--with-xmlsec=PATH],[where xmlsec is installed]),,
-    [with_xmlsec=/usr])
-if test x_$with_xmlsec != x_/usr; then
-    CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
-    LIBS="-L${with_xmlsec}/lib -lxml-security-c $LIBS"
-else
-    LIBS="-lxml-security-c $LIBS"
-fi
-AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find xmlsec header files]))
-AC_MSG_CHECKING([XML-Security version])
-AC_PREPROC_IFELSE(
-    [AC_LANG_PROGRAM([#include <xsec/utils/XSECPlatformUtils.hpp>],
-    [#if XSEC_VERSION_MAJOR >= 2
-int i = 0;
-#else
-#error need version 2.0.0 or later
-#endif])],
-    [AC_MSG_RESULT(OK)],
-    [AC_MSG_FAILURE([XML-Security version 2.0.0 or greater is required.])])
-AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[#include <xsec/utils/XSECPlatformUtils.hpp>]],
-        [[XSECPlatformUtils::Initialise()]])],,
-    [AC_MSG_ERROR([unable to link with XML-Security])])
+AX_PKG_CHECK_MODULES([xmlsec],,[xml-security-c >= 2])
 
 AX_PKG_CHECK_MODULES([xmltooling],,[xmltooling >= 3])
 PKG_CHECK_VAR([DX_INCLUDE], [xmltooling], [includedir])
diff --git a/saml/Makefile.am b/saml/Makefile.am
index 2f60e7e..643637f 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -185,11 +185,13 @@ libsaml_la_CPPFLAGS = \
 libsaml_la_CXXFLAGS = \
     $(PTHREAD_CFLAGS) \
     $(xerces_CFLAGS) \
+    $(xmlsec_CFLAGS) \
     $(xmltooling_CFLAGS) \
     $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 libsaml_la_LIBADD = \
     $(PTHREAD_LIBS) \
     $(xerces_LIBS) \
+    $(xmlsec_LIBS) \
     $(xmltooling_LIBS) \
     $(log4shib_LIBS) $(log4cpp_LIBS)
 
diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 1f89b64..6aa7418 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -123,9 +123,11 @@ $(nodist_samltest_SOURCES): %.cpp: %.h
 
 samltest_CXXFLAGS = \
     $(xerces_CFLAGS) \
+    $(xmlsec_CFLAGS) \
     $(xmltooling_CFLAGS)
 samltest_LDADD = $(top_builddir)/saml/libsaml.la \
     $(xerces_LIBS) \
+    $(xmlsec_LIBS) \
     $(xmltooling_LIBS)
 
 EXTRA_DIST = data

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