[cpp-opensaml] 10/19: Make pkgxmldir configurable and export it via pkg-config

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

commit ba2521b60aea1758d90d830b0d57bcdee3c9f3d2
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Tue Jul 12 10:48:35 2016 +0200

    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 7b5461f..f563d8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,5 +117,11 @@ AC_SUBST(CXXTEST)
 AC_SUBST(CXXTESTFLAGS)
 AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
+AC_ARG_WITH([pkgxmldir],
+    AS_HELP_STRING([--with-pkgxmldir],
+        [where to install the schema files @<:@default=${datadir}/xml/AC_PACKAGE_TARNAME@:>@])],
+    [],[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 817e3e7..1791657 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@
+pkgxmldir=@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 \

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