Skip to content
Snippets Groups Projects
Commit c1b7140d87e8 authored by Hugh McMaster's avatar Hugh McMaster
Browse files

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.
parent 433d6bcbdd13
Branches
Tags
No related merge requests found
......@@ -38,6 +38,7 @@
-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
......
......@@ -612,7 +612,8 @@
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)
......@@ -616,6 +617,7 @@
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}'
......@@ -619,7 +621,7 @@
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)
......
......@@ -16,6 +16,7 @@
--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 @@
;;
--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@"
;;
*)
......
......@@ -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@"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment