[libxslt] xslt-config: Simply handling of --cflags
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] xslt-config: Simply handling of --cflags
- Date: Tue, 30 Jul 2019 11:12:30 +0000 (UTC)
commit 6be203f1ac6aa5f97b43d4e6ea0bab438f1192ad
Author: Hugh McMaster <hugh mcmaster outlook com>
Date: Mon Jul 29 21:16:16 2019 +1000
xslt-config: Simply handling of --cflags
The `configure' script already detects the libxml2 CFLAGS,
so we shouldn't override the detected values.
xslt-config.in | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/xslt-config.in b/xslt-config.in
index 45c3e28f..8c8b9e1c 100644
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -29,7 +29,6 @@ if test $# -eq 0; then
usage 1
fi
-cflags=false
libs=false
while test $# -gt 0; do
@@ -74,7 +73,11 @@ while test $# -gt 0; do
;;
--cflags)
- cflags=true
+ cflags="@LIBXML_CFLAGS@"
+ if test "$includedir" != "/usr/include"; then
+ cflags="$cflags @XSLT_INCLUDEDIR@"
+ fi
+ all_flags="$cflags $all_flags"
;;
--libs)
@@ -90,15 +93,6 @@ while test $# -gt 0; do
done
the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
-if test "$includedir" != "/usr/include"; then
- the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
-else
- the_flags="$the_flags `@XML_CONFIG@ --cflags`"
-fi
-
-if $cflags; then
- all_flags="$the_flags"
-fi
if $libs; then
all_flags="$all_flags $services $the_libs"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]