[libxslt] xslt-config.in: Add a --dynamic option to --libs

[Nick Wellnhofer <nwellnhof src gnome org>]

commit cc1b0b4b686c371059cec2b90a8a7aa7cd16c873
Author: Hugh McMaster <hugh mcmaster outlook com>
Date:   Mon Jul 29 21:45:32 2019 +1000

    xslt-config.in: Add a --dynamic option to --libs
    
    xslt-config --libs prints static library linking information by default.
    This is un-necessary for most programs, so introduce a new option, --dynamic,
    which, when combined with --libs, only prints shared library linking information.

 Makefile.am    |  1 +
 configure.ac   |  6 ++++--
 xslt-config.in | 15 +++++++++++++--
 xsltConf.sh.in |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ff10f574..2c417d0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ xsltConf.sh: xsltConf.sh.in Makefile
            -e 's?\@XSLT_INCLUDEDIR\@?$(XSLT_INCLUDEDIR)?g' \
            -e 's?\@VERSION\@?$(VERSION)?g' \
            -e 's?\@XSLT_LIBS\@?$(XSLT_LIBS) $(EXTRA_LIBS)?g' \
+           -e 's?\@XSLT_PRIVATE_LIBS\@?$(XSLT_PRIVATE_LIBS)?g' \
               < $(srcdir)/xsltConf.sh.in > xsltConf.tmp \
        && mv xsltConf.tmp xsltConf.sh
 
diff --git a/configure.ac b/configure.ac
index 501bb391..2e01cac9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,14 +612,16 @@ AC_SUBST(PYTHON_SITE_PACKAGES)
 
 XSLT_LIBDIR='-L${libdir}'
 XSLT_INCLUDEDIR='-I${includedir}'
-XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"
+XSLT_LIBS="-lxslt $LIBXML_LIBS"
+XSLT_PRIVATE_LIBS="$M_LIBS"
 AC_SUBST(XSLT_LIBDIR)
 AC_SUBST(XSLT_INCLUDEDIR)
 AC_SUBST(XSLT_LIBS)
+AC_SUBST(XSLT_PRIVATE_LIBS)
 
 EXSLT_LIBDIR='-L${libdir}'
 EXSLT_INCLUDEDIR='-I${includedir}'
-EXSLT_LIBS="-lexslt $XSLT_LIBS $LIBGCRYPT_LIBS"
+EXSLT_LIBS="-lexslt $XSLT_LIBS $XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS"
 AC_SUBST(EXSLT_LIBDIR)
 AC_SUBST(EXSLT_INCLUDEDIR)
 AC_SUBST(EXSLT_LIBS)
diff --git a/xslt-config.in b/xslt-config.in
index e40ea299..8b72e1df 100644
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -16,6 +16,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 --dynamic to print only shared libraries
   --cflags             print pre-processor and compiler flags
   --plugins            print plugin directory
   --help               display this help and exit
@@ -79,8 +80,18 @@ while test $# -gt 0; do
                ;;
 
     --libs)
-        libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
-        all_flags="$all_flags $libs"
+        if [ "$2" = "--dynamic" ]; then
+            shift
+            libs="@XSLT_LIBS@"
+        else
+            libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@"
+        fi
+
+        if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then
+            libs="@XSLT_LIBDIR@ $libs"
+        fi
+
+        all_flags="$all_flags $libs @EXTRA_LIBS@"
                ;;
 
     *)
diff --git a/xsltConf.sh.in b/xsltConf.sh.in
index 666774b6..f7e8fa15 100644
--- a/xsltConf.sh.in
+++ b/xsltConf.sh.in
@@ -3,5 +3,6 @@
 #
 XSLT_LIBDIR="@XSLT_LIBDIR@"
 XSLT_LIBS="@XSLT_LIBS@"
+XSLT_PRIVATE_LIBS="@XSLT_PRIVATE_LIBS@"
 XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
 MODULE_VERSION="xslt-@VERSION@"