blob: 805cbb3315a61e91e9e457a6258dfbd15722cb4b [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>
Patrick Williamsc124f4f2015-09-15 14:41:29 -050010---
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050011 configure.in | 23 +++--------------------
12 1 file changed, 3 insertions(+), 20 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050013
14diff --git a/configure.in b/configure.in
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050015index 0db826d..75819eb 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050016--- a/configure.in
17+++ b/configure.in
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050018@@ -2107,26 +2107,9 @@ case "$use_libxml2" in
Patrick Williamsc124f4f2015-09-15 14:41:29 -050019 DST_LIBXML2_INC=""
20 ;;
21 auto|yes)
22- case X`(xml2-config --version) 2>/dev/null` in
23- X2.[[6789]].*)
24- libxml2_libs=`xml2-config --libs`
25- libxml2_cflags=`xml2-config --cflags`
26- ;;
27- *)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050028- if test "$use_libxml2" = "yes" ; then
29- AC_MSG_RESULT(no)
30- AC_MSG_ERROR(required libxml2 version not available)
31- else
32- libxml2_libs=
33- libxml2_cflags=
34- fi
Patrick Williamsc124f4f2015-09-15 14:41:29 -050035- ;;
36- esac
37- ;;
38- *)
39- if test -f "$use_libxml2/bin/xml2-config" ; then
40- libxml2_libs=`$use_libxml2/bin/xml2-config --libs`
41- libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags`
42+ if pkg-config --exists libxml-2.0 ; then
43+ libxml2_libs=`pkg-config libxml-2.0 --libs`
44+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
45 fi
46 ;;
47 esac
48--
492.1.4
50