[cpp-sp] 12/17: Use pkg-config for xmlsec, but remove superfluous linkages

[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=ac27219289bffb02d186e7e630a4bf7d3c06188a

commit ac27219289bffb02d186e7e630a4bf7d3c06188a
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jul 14 15:41:43 2016 +0200

    Use pkg-config for xmlsec, but remove superfluous linkages
---
 adfs/Makefile.am           |  2 +-
 configure.ac               | 37 ++-----------------------------------
 memcache-store/Makefile.am |  3 ++-
 odbc-store/Makefile.am     |  3 ++-
 plugins/Makefile.am        |  2 +-
 shibd/Makefile.am          |  2 +-
 shibsp/Makefile.am         |  5 +++--
 util/Makefile.am           |  6 ++----
 8 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index 13379a5..c6b9007 100644
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = adfs.la adfs-lite.la
 adfs_la_CXXFLAGS = \
 	$(opensaml_CFLAGS) \
 	$(xmltooling_CFLAGS)
-adfs_la_LIBADD = $(XMLSEC_LIBS) \
+adfs_la_LIBADD = \
 	$(top_builddir)/shibsp/libshibsp.la \
 	$(opensaml_LIBS) \
 	$(xmltooling_LIBS)
diff --git a/configure.ac b/configure.ac
index 1f5f482..905ae62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,39 +147,8 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
 AX_PKG_CHECK_MODULES([xerces],,[xerces-c >= 3.2],,,
     [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
 
-# 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"
-    XMLSEC_LIBS="-L${with_xmlsec}/lib -lxml-security-c $XMLSEC_LIBS"
-else
-    XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS"
-fi
-
-# save and append master libs
-save_LIBS="$LIBS"
-LIBS="$XMLSEC_LIBS $LIBS"
-
-AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find XML-Security-C header files]))
-AC_MSG_CHECKING([XML-Security-C 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])])
-
-# restore master libs
-LIBS="$save_LIBS"
+AX_PKG_CHECK_MODULES([xmlsec],,[xml-security-c >= 2],,,
+    [SHIBSP_REQUIRES],[SHIBSP_REQUIRES_PRIVATE])
 
 AX_PKG_CHECK_MODULES([xmltooling],,[xmltooling >= 3],,,
     [SHIBSP_REQUIRES],[SHIBSP_REQUIRES_PRIVATE])
@@ -194,8 +163,6 @@ AX_PKG_CHECK_MODULES([opensaml],,[opensaml >= 3],,,
     [SHIBSP_REQUIRES],[SHIBSP_REQUIRES_PRIVATE])
 PKG_CHECK_VAR([OPENSAMLXMLDIR],[opensaml],[pkgxmldir])
 
-AC_SUBST(XMLSEC_LIBS)
-
 # output the underlying makefiles
 WANT_SUBDIRS="doc schemas configs shibsp plugins shibd util"
 AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index 54f9c25..ca801ca 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -12,7 +12,8 @@ memcache_store_la_CXXFLAGS = \
 	$(opensaml_CFLAGS) \
 	$(xerces_CFLAGS) \
 	$(xmltooling_CFLAGS)
-memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS) \
+memcache_store_la_LIBADD = \
+	$(MEMCACHED_LIBS) \
 	$(PTHREAD_LIBS) \
 	$(opensaml_LIBS) \
 	$(xerces_LIBS) \
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index d5d9b63..0fe909a 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -12,7 +12,8 @@ odbc_store_la_CXXFLAGS = \
 	$(opensaml_CFLAGS) \
 	$(xerces_CFLAGS) \
 	$(xmltooling_CFLAGS)
-odbc_store_la_LIBADD = $(XMLSEC_LIBS) $(ODBC_LIBS) \
+odbc_store_la_LIBADD = \
+	$(ODBC_LIBS) \
 	$(PTHREAD_LIBS) \
 	$(opensaml_LIBS) \
 	$(xerces_LIBS) \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 7c859e0..a21f512 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -26,7 +26,7 @@ plugins_la_CXXFLAGS = \
 	$(opensaml_CFLAGS) \
 	$(xerces_CFLAGS) \
 	$(xmltooling_CFLAGS)
-plugins_la_LIBADD = $(XMLSEC_LIBS) \
+plugins_la_LIBADD = \
 	$(top_builddir)/shibsp/libshibsp.la \
 	$(PTHREAD_LIBS) \
 	$(opensaml_LIBS) \
diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index b856947..68192f4 100644
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -10,7 +10,7 @@ shibd_CXXFLAGS = \
   $(opensaml_CFLAGS) \
   $(xerces_CFLAGS) \
   $(xmltooling_CFLAGS)
-shibd_LDADD = $(XMLSEC_LIBS) \
+shibd_LDADD = \
   $(top_builddir)/shibsp/libshibsp.la \
   $(PTHREAD_LIBS) \
   $(SYSTEMD_LIBS) \
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 3505fe5..da3c778 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -249,14 +249,15 @@ libshibsp_la_CXXFLAGS = \
     $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
     $(opensaml_CFLAGS) \
     $(xerces_CFLAGS) \
+    $(xmlsec_CFLAGS) \
     $(xmltooling_CFLAGS)
 libshibsp_la_LIBADD = \
     $(PTHREAD_LIBS) \
     $(log4shib_LIBS) $(log4cpp_LIBS) \
     $(opensaml_LIBS) \
     $(xerces_LIBS) \
-    $(xmltooling_LIBS) \
-    $(XMLSEC_LIBS)
+    $(xmlsec_LIBS) \
+    $(xmltooling_LIBS)
 libshibsp_lite_la_LDFLAGS = -version-info 8:0:0
 libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
     $(BOOST_CPPFLAGS) \
diff --git a/util/Makefile.am b/util/Makefile.am
index bb13f81..5866c6b 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,8 +15,7 @@ resolvertest_LDADD = \
 	$(log4shib_LIBS) $(log4cpp_LIBS) \
 	$(opensaml_LIBS) \
 	$(xerces_LIBS) \
-	$(xmltooling_LIBS) \
-	$(XMLSEC_LIBS)
+	$(xmltooling_LIBS)
 
 mdquery_SOURCES = mdquery.cpp
 
@@ -35,5 +34,4 @@ mdquery_LDADD = \
 	$(log4shib_LIBS) $(log4cpp_LIBS) \
 	$(opensaml_LIBS) \
 	$(xerces_LIBS) \
-	$(xmltooling_LIBS) \
-	$(XMLSEC_LIBS)
+	$(xmltooling_LIBS)

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