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
|
From: Aron Xu <aron@debian.org>
Date: Wed, 3 Oct 2012 00:46:34 +0800
Subject: patch xslt-config to add private libraries
---
libexslt.pc.in | 1 +
libxslt.pc.in | 1 +
xslt-config.in | 14 ++++++++++++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/libexslt.pc.in b/libexslt.pc.in
index 16676ff..2f6378f 100644
--- a/libexslt.pc.in
+++ b/libexslt.pc.in
@@ -9,4 +9,5 @@ Version: @LIBEXSLT_VERSION@
Description: EXSLT Extension library
Requires: libxml-2.0
Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
+Libs.private: @M_LIBS@ @LIBGCRYPT_LIBS@
Cflags: @EXSLT_INCLUDEDIR@
diff --git a/libxslt.pc.in b/libxslt.pc.in
index 082d64c..ccd6e77 100644
--- a/libxslt.pc.in
+++ b/libxslt.pc.in
@@ -9,4 +9,5 @@ Version: @VERSION@
Description: XSLT library version 2.
Requires: libxml-2.0
Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
+Libs.private: @M_LIBS@
Cflags: @XSLT_INCLUDEDIR@
diff --git a/xslt-config.in b/xslt-config.in
index 45c3e28..826a0a8 100644
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -4,7 +4,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
includedir=@includedir@
-libdir=@libdir@
usage()
{
@@ -16,6 +15,7 @@ Known values for OPTION are:
--prefix=DIR change XSLT prefix [default $prefix]
--exec-prefix=DIR change XSLT executable prefix [default $exec_prefix]
--libs print library linking information
+ add --static to print static library linking information
--cflags print pre-processor and compiler flags
--plugins print plugin directory
--help display this help and exit
@@ -31,6 +31,7 @@ fi
cflags=false
libs=false
+static=false
while test $# -gt 0; do
case "$1" in
@@ -79,6 +80,11 @@ while test $# -gt 0; do
--libs)
libs=true
+ if [ "$2" = "--static" ]
+ then
+ shift
+ static=true
+ fi
;;
*)
@@ -89,7 +95,7 @@ while test $# -gt 0; do
shift
done
-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
+the_libs="@XSLT_LIBS@"
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
@@ -100,6 +106,10 @@ if $cflags; then
all_flags="$the_flags"
fi
+if $static; then
+ the_libs="$the_libs @M_LIBS@ `@XML_CONFIG@ --libs --static`"
+fi
+
if $libs; then
all_flags="$all_flags $services $the_libs"
fi
|