[opensaml2] 01/03: Export pkgxmldir (the correct name) via pkg-config

[Ferenc Wágner]

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

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

commit 848c048461c2cdf18a73e2f54bb129a7ce735bcb
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Sep 7 10:39:44 2016 +0200

    Export pkgxmldir (the correct name) via pkg-config
    
    And call it pkgxmldir instead of xmldir in the configure script.
    
    Closes: #836921
---
 ...e-pkgxmldir-configurable-and-export-it-via-pkg-co.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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
index ac11dae..f360a4d 100644
--- 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
@@ -9,23 +9,23 @@ Subject: Make pkgxmldir configurable and export it via pkg-config
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b51cce1..5e27029 100644
+index b51cce1..9115b80 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],
++AC_ARG_WITH([pkgxmldir],
++    AS_HELP_STRING([--with-pkgxmldir],
 +        [where to install the schema files @<:@default=${datadir}/xml/AC_PACKAGE_TARNAME@:>@])],
-+    [],[with_xmldir=${datadir}/xml/AC_PACKAGE_TARNAME])
-+AC_SUBST([pkgxmldir],[${with_xmldir}])
++    [],[with_pkgxmldir=${datadir}/xml/AC_PACKAGE_TARNAME])
++AC_SUBST([pkgxmldir],[${with_pkgxmldir}])
 +
  # output packaging and makefiles
  AC_OUTPUT
 diff --git a/opensaml.pc.in b/opensaml.pc.in
-index 858cefb..c77093e 100644
+index 858cefb..e8a33ff 100644
 --- a/opensaml.pc.in
 +++ b/opensaml.pc.in
 @@ -2,6 +2,8 @@ prefix=@prefix@
@@ -33,7 +33,7 @@ index 858cefb..c77093e 100644
  libdir=@libdir@
  includedir=@includedir@
 +datarootdir=@datarootdir@
-+xmldir=@pkgxmldir@
++pkgxmldir=@pkgxmldir@
   
  Name: @PACKAGE_NAME@
  Description: OpenSAML library

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