blob: 1e23c0f56b7f878eecbd613236150f10b4a8cf4d [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001xml2-config is disabled, so change the configure script to use pkgconfig to find
2libxml2.
3
4Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05007Update context for version 9.10.3-P2.
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050010
11Update context for version 9.10.5-P3.
12
13Signed-off-by: Kai Kang <kai.kang@windriver.com>
Patrick Williamsc124f4f2015-09-15 14:41:29 -050014---
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050015 configure.in | 23 +++--------------------
16 1 file changed, 3 insertions(+), 20 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050017
18diff --git a/configure.in b/configure.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050019index 4da73a4..6f2a754 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050020--- a/configure.in
21+++ b/configure.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050022@@ -2282,26 +2282,9 @@ case "$use_libxml2" in
Patrick Williamsc124f4f2015-09-15 14:41:29 -050023 DST_LIBXML2_INC=""
24 ;;
25 auto|yes)
26- case X`(xml2-config --version) 2>/dev/null` in
27- X2.[[6789]].*)
28- libxml2_libs=`xml2-config --libs`
29- libxml2_cflags=`xml2-config --cflags`
30- ;;
31- *)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050032- if test "yes" = "$use_libxml2" ; then
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050033- AC_MSG_RESULT(no)
34- AC_MSG_ERROR(required libxml2 version not available)
35- else
36- libxml2_libs=
37- libxml2_cflags=
38- fi
Patrick Williamsc124f4f2015-09-15 14:41:29 -050039- ;;
40- esac
41- ;;
42- *)
43- if test -f "$use_libxml2/bin/xml2-config" ; then
44- libxml2_libs=`$use_libxml2/bin/xml2-config --libs`
45- libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags`
46+ if pkg-config --exists libxml-2.0 ; then
47+ libxml2_libs=`pkg-config libxml-2.0 --libs`
48+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
49 fi
50 ;;
51 esac
52--
532.1.4
54