[cpp-xmltooling] 08/22: Make pkgxmldir configurable

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=7689128109a04fb3f04e1336e87c6b62bf743f36

commit 7689128109a04fb3f04e1336e87c6b62bf743f36
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Tue Jul 5 13:45:57 2016 +0200

    Make pkgxmldir configurable
---
 configure.ac        | 6 ++++++
 schemas/Makefile.am | 2 --
 xmltooling.pc.in    | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 24a98c3..7489a5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,5 +172,11 @@ AC_ARG_VAR([CXXTEST], [override the cxxtestgen executable and options])
 AC_CHECK_PROGS([CXXTEST], [cxxtestgen cxxtestgen.pl], [false])
 AM_CONDITIONAL([BUILD_UNITTEST], [test "x${CXXTEST}" != xfalse])
 
+AC_ARG_WITH([pkgxmldir],
+    AS_HELP_STRING([--with-pkgxmldir=DIR],
+        [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/schemas/Makefile.am b/schemas/Makefile.am
index ee11aac..3b9c00c 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -9,8 +9,6 @@ schemafiles = \
 	xml.xsd \
 	xmltooling.xsd
 
-pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
-
 pkgxml_DATA = \
 	catalog.xml \
 	$(schemafiles)
diff --git a/xmltooling.pc.in b/xmltooling.pc.in
index a2ac965..5a97739 100644
--- a/xmltooling.pc.in
+++ b/xmltooling.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 XMLTooling-C library

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