[opensaml2] 20/24: New patch Make-pkgxmldir-configurable-and-export-it-via-pkg-co.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 e1050c0d5ea1282c59436617040cb06318e45ac3
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Tue Jul 12 11:12:40 2016 +0200

    New patch Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch
    
    Make pkgxmldir configurable and export it via pkg-config
---
 ...dir-configurable-and-export-it-via-pkg-co.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch b/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch
new file mode 100644
index 0000000..ac11dae
--- /dev/null
+++ b/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch
@@ -0,0 +1,52 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Tue, 12 Jul 2016 10:48:35 +0200
+Subject: Make pkgxmldir configurable and export it via pkg-config
+
+---
+ configure.ac        | 6 ++++++
+ opensaml.pc.in      | 2 ++
+ schemas/Makefile.am | 2 --
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b51cce1..5e27029 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,5 +139,11 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
+ dnl Disabled on Debian since build log analysis wants verbose logs.
+ dnl LIBTOOL="$LIBTOOL --silent"
+ 
++AC_ARG_WITH([xmldir],
++    AS_HELP_STRING([--with-xmldir],
++        [where to install the schema files @<:@default=${datadir}/xml/AC_PACKAGE_TARNAME@:>@])],
++    [],[with_xmldir=${datadir}/xml/AC_PACKAGE_TARNAME])
++AC_SUBST([pkgxmldir],[${with_xmldir}])
++
+ # output packaging and makefiles
+ AC_OUTPUT
+diff --git a/opensaml.pc.in b/opensaml.pc.in
+index 858cefb..c77093e 100644
+--- a/opensaml.pc.in
++++ b/opensaml.pc.in
+@@ -2,6 +2,8 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++datarootdir=@datarootdir@
++xmldir=@pkgxmldir@
+  
+ Name: @PACKAGE_NAME@
+ Description: OpenSAML library
+diff --git a/schemas/Makefile.am b/schemas/Makefile.am
+index 0ee9485..c6c8277 100644
+--- a/schemas/Makefile.am
++++ b/schemas/Makefile.am
+@@ -1,8 +1,6 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-pkgxmldir = $(datadir)/xml/@PACKAGE@
+-
+ schemafiles = \
+ 	cs-sstc-schema-assertion-01.xsd \
+ 	cs-sstc-schema-protocol-01.xsd \
diff --git a/debian/patches/series b/debian/patches/series
index 2a3a6e5..016260c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ We-don-t-use-OpenSSL-directly.patch
 Use-pkg-config-for-Xerces.patch
 Use-pkg-config-for-xmlsec.patch
 Make-pkgconfigdir-configurable.patch
+Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch

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