[xmltooling] 19/19: Add separate pkg-config file for xmltooling-lite

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch patch-queue/debian/experimental
in repository xmltooling.

commit 38b82d9c781f29a6b3df4105f17b53da69771f6c
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Jul 20 11:51:21 2016 +0200

    Add separate pkg-config file for xmltooling-lite
---
 Makefile.am           |  2 +-
 configure.ac          | 22 ++++++++++++----------
 xmltooling-lite.pc.in | 13 +++++++++++++
 xmltooling.pc.in      |  4 ++--
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index be2f2bd..8be5fd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ else
 all-local:
 endif
 
-pkgconfig_DATA = @PACKAGE_NAME at .pc
+pkgconfig_DATA = @PACKAGE_NAME at .pc @PACKAGE_NAME at -lite.pc
 
 GENFILES = @PACKAGE_NAME at .spec
 
diff --git a/configure.ac b/configure.ac
index 192be11..7e09f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ else
 fi
 
 AC_CONFIG_HEADERS([config.h xmltooling/config_pub.h])
-AC_CONFIG_FILES([xmltooling.pc xmltooling.spec])
+AC_CONFIG_FILES([xmltooling.pc xmltooling-lite.pc xmltooling.spec])
 AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile])
 
 AC_PROG_CC([gcc gcc3 cc])
@@ -125,10 +125,13 @@ AC_COMPILE_IFELSE(
 AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
     [AC_DEFINE([XMLTOOLING_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
     [AX_PKG_CHECK_MODULES([log4cpp],,[log4cpp],
-        [AC_DEFINE([XMLTOOLING_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])])])
+        [AC_DEFINE([XMLTOOLING_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])],,
+        [XMLTOOLING_LITE_REQUIRES],[XMLTOOLING_LITE_REQUIRES_PRIVATE])],,
+    [XMLTOOLING_LITE_REQUIRES],[XMLTOOLING_LITE_REQUIRES_PRIVATE])
 
 # Xerces-C v2.6.0 has bugs that inhibit use with signed XML
-AX_PKG_CHECK_MODULES([xerces],,[xerces-c != 2.6.0])
+AX_PKG_CHECK_MODULES([xerces],,[xerces-c != 2.6.0],,,
+    [XMLTOOLING_LITE_REQUIRES],[XMLTOOLING_LITE_REQUIRES_PRIVATE])
 AX_SAVE_FLAGS
 CPPFLAGS="$xerces_CFLAGS $CPPFLAGS"
 LIBS="$xerces_LIBS $LIBS"
@@ -241,13 +244,12 @@ AS_IF([test "x$with_xmlsec" != xno],
 
          AX_RESTORE_FLAGS
         ],
-        [AS_IF([test "x$with_xmlsec" = xyes],
-               [AC_MSG_FAILURE([--with-xmlsec was given, but the package was not found])],
-               [AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])
-                AC_DEFINE([XMLTOOLING_NO_XMLSEC],[1],
-                    [Define to 1 if you wish to disable XML-Security-dependent features.])]
-              )
-        ])
+        [AS_IF([test "x$with_xmlsec" = xcheck],
+             [AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])
+              AC_DEFINE([XMLTOOLING_NO_XMLSEC],[1],
+                  [Define to 1 if you wish to disable XML-Security-dependent features.])],
+             [AC_MSG_FAILURE([--with-xmlsec was given, but the package was not found])])
+        ],[XMLTOOLING_REQUIRES],[XMLTOOLING_REQUIRES_PRIVATE])
     ])
 
 AM_CONDITIONAL(BUILD_XMLSEC,test "x$XMLSEC_LIBS" != x)
diff --git a/xmltooling-lite.pc.in b/xmltooling-lite.pc.in
new file mode 100644
index 0000000..fb9c73e
--- /dev/null
+++ b/xmltooling-lite.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@ (lite version)
+Description: OpenSAML XMLTooling-C library (lite version)
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lxmltooling-lite
+Libs.private: @dlopen_LIBS@ @PTHREAD_LIBS@
+Cflags: -I${includedir} @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@
+Requires: @XMLTOOLING_LITE_REQUIRES@
+Requires.private: @XMLTOOLING_LITE_REQUIRES_PRIVATE@
diff --git a/xmltooling.pc.in b/xmltooling.pc.in
index 6d2c2cf..56610cc 100644
--- a/xmltooling.pc.in
+++ b/xmltooling.pc.in
@@ -11,5 +11,5 @@ Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lxmltooling
 Libs.private: @dlopen_LIBS@ @PTHREAD_LIBS@
 Cflags: -I${includedir} @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@
-Requires: @AX_PACKAGE_REQUIRES@
-Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@
+Requires: @XMLTOOLING_REQUIRES@ @XMLTOOLING_LITE_REQUIRES@
+Requires.private: @XMLTOOLING_REQUIRES_PRIVATE@ @XMLTOOLING_LITE_REQUIRES_PRIVATE@

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