1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@niif.hu>
Date: Wed, 20 Jul 2016 11:51:21 +0200
Subject: 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(-)
create mode 100644 xmltooling-lite.pc.in
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@.pc
+pkgconfig_DATA = @PACKAGE_NAME@.pc @PACKAGE_NAME@-lite.pc
GENFILES = @PACKAGE_NAME@.spec
diff --git a/configure.ac b/configure.ac
index 4de77d8..131e5ba 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 d4a4ea7..5a97739 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@
|
