[libxml2] xml2-config.in: Output CFLAGS and LIBS on the same line
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] xml2-config.in: Output CFLAGS and LIBS on the same line
- Date: Fri, 2 Aug 2019 11:34:20 +0000 (UTC)
commit 2f2bf4b2caa1cb9a4a5039b7a44db101943382d1
Author: Hugh McMaster <hugh mcmaster outlook com>
Date: Wed Jul 31 20:21:47 2019 +1000
xml2-config.in: Output CFLAGS and LIBS on the same line
xml2-config currently outputs the results of '--cflags --libs' on two lines.
Printing this information on one line is far more useful.
xml2-config.in | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/xml2-config.in b/xml2-config.in
index 6b87fc8c..cb4aa613 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -29,9 +29,6 @@ if test $# -eq 0; then
usage 1
fi
-cflags=false
-libs=false
-
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -68,7 +65,7 @@ while test $# -gt 0; do
;;
--cflags)
- echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+ cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
;;
--libtool-libs)
@@ -85,16 +82,16 @@ while test $# -gt 0; do
--libs)
if [ "$2" = "--dynamic" ]; then
shift
- LIBS="@XML_LIBS@"
+ libs="@XML_LIBS@"
else
- LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
+ libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
fi
if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
- LIBS="@XML_LIBDIR@ $LIBS"
+ libs="@XML_LIBDIR@ $libs"
fi
- echo ${LIBS} @WIN32_EXTRA_LIBADD@
+ libs="$libs @WIN32_EXTRA_LIBADD@"
;;
*)
@@ -105,4 +102,8 @@ while test $# -gt 0; do
shift
done
+if test "$cflags" -o "$libs"; then
+ echo $cflags $libs
+fi
+
exit 0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]