[opensaml2] 10/24: New patch Use-pkg-config-for-xmltooling.patch

[Ferenc Wágner]

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

wferi pushed a commit to branch debian/experimental
in repository opensaml2.

commit 3ada08197a2e400cd2bee81a9e253ccf37446a05
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Fri Jul 1 20:43:44 2016 +0200

    New patch Use-pkg-config-for-xmltooling.patch
    
    Use pkg-config for xmltooling
---
 debian/patches/Use-pkg-config-for-xmltooling.patch | 108 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 109 insertions(+)

diff --git a/debian/patches/Use-pkg-config-for-xmltooling.patch b/debian/patches/Use-pkg-config-for-xmltooling.patch
new file mode 100644
index 0000000..4132dce
--- /dev/null
+++ b/debian/patches/Use-pkg-config-for-xmltooling.patch
@@ -0,0 +1,108 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Mon, 11 Jul 2016 10:15:37 +0200
+Subject: Use pkg-config for xmltooling
+
+---
+ configure.ac         | 27 ++-------------------------
+ saml/Makefile.am     |  2 ++
+ samlsign/Makefile.am |  2 ++
+ samltest/Makefile.am |  5 ++++-
+ 4 files changed, 10 insertions(+), 26 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bba1f29..f248b0f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,6 @@ DX_XML_FEATURE(OFF)
+ DX_PDF_FEATURE(OFF)
+ DX_PS_FEATURE(OFF)
+ DX_INIT_DOXYGEN(opensaml, doxygen.cfg, doc/api)
+-DX_INCLUDE=
+ 
+ AC_ARG_ENABLE(debug,
+     AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]),
+@@ -224,29 +223,8 @@ AC_LINK_IFELSE(
+         [[XSECPlatformUtils::Initialise()]])],,
+     [AC_MSG_ERROR([unable to link with XML-Security])])
+ 
+-# XML-Tooling settings
+-AC_ARG_WITH(xmltooling,
+-    AS_HELP_STRING([--with-xmltooling=PATH],[where xmltooling is installed]),,
+-    [with_xmltooling=/usr])
+-if test x_$with_xmltooling != x_/usr; then
+-    CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+-    DX_INCLUDE="${with_xmltooling}/include"
+-    LIBS="-L${with_xmltooling}/lib -lxmltooling $LIBS"
+-else
+-    LIBS="-lxmltooling $LIBS"
+-fi
+-
+-AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
+-
+-AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([[#include <xmltooling/XMLToolingConfig.h>
+-#include <xmltooling/version.h>]],
+-        [[#if _XMLTOOLING_VERSION >= 10400
+-xmltooling::XMLToolingConfig::getConfig();
+-#else
+-#error Need XMLTooling version 1.4 or higher
+-#endif]])],
+-    ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
++PKG_CHECK_MODULES([xmltooling], [xmltooling >= 1.4])
++PKG_CHECK_VAR([DX_INCLUDE], [xmltooling], [includedir])
+ 
+ # Check for unit test support
+ CXXTEST="/usr/bin/cxxtestgen.pl"
+@@ -267,7 +245,6 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
+ 
+ AX_CREATE_PKGCONFIG_INFO(,,[$LIBS -lsaml],[OpenSAML library])
+ 
+-AC_SUBST(DX_INCLUDE)
+ dnl Disabled on Debian since build log analysis wants verbose logs.
+ dnl LIBTOOL="$LIBTOOL --silent"
+ 
+diff --git a/saml/Makefile.am b/saml/Makefile.am
+index c09b573..ff03803 100644
+--- a/saml/Makefile.am
++++ b/saml/Makefile.am
+@@ -194,8 +194,10 @@ libsaml_la_SOURCES = \
+ # http://sources.redhat.com/autobook/autobook/autobook_91.html
+ libsaml_la_LDFLAGS = -version-info 9:0:0
+ libsaml_la_CPPFLAGS = \
++    $(xmltooling_CFLAGS) \
+     $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+ libsaml_la_LIBADD = \
++    $(xmltooling_LIBS) \
+     $(log4shib_LIBS) $(log4cpp_LIBS)
+ 
+ install-exec-hook:
+diff --git a/samlsign/Makefile.am b/samlsign/Makefile.am
+index 2dde4a6..9181a20 100644
+--- a/samlsign/Makefile.am
++++ b/samlsign/Makefile.am
+@@ -6,8 +6,10 @@ samlsign_SOURCES = samlsign.cpp
+ 
+ samlsign_LDADD = $(top_builddir)/saml/libsaml.la
+ samlsign_CPPFLAGS = \
++    $(xmltooling_CFLAGS) \
+     $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+ samlsign_LDADD += \
++    $(xmltooling_LIBS) \
+     $(log4shib_LIBS) $(log4cpp_LIBS)
+ 
+ EXTRA_DIST = resource.h samlsign.rc
+diff --git a/samltest/Makefile.am b/samltest/Makefile.am
+index 27cc395..37cb576 100644
+--- a/samltest/Makefile.am
++++ b/samltest/Makefile.am
+@@ -121,6 +121,9 @@ do-cxxtestgen:
+ $(nodist_samltest_SOURCES): %.cpp: %.h
+ 	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
+ 
+-samltest_LDADD = $(top_builddir)/saml/libsaml.la
++samltest_CPPFLAGS = \
++    $(xmltooling_CFLAGS)
++samltest_LDADD = $(top_builddir)/saml/libsaml.la \
++    $(xmltooling_LIBS)
+ 
+ EXTRA_DIST = data
diff --git a/debian/patches/series b/debian/patches/series
index b735d92..c8b2d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Disable-forcing-of-libtool-silent.patch
 Use-pkg-config-for-log4shib-log4cpp.patch
+Use-pkg-config-for-xmltooling.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git