| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | xml2-config is disabled, so change the configure script to use pkgconfig to find |
| 2 | libxml2. |
| 3 | |
| 4 | Upstream-Status: Inappropriate |
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 6 | |
| 7 | --- |
| 8 | configure.in | 18 +++--------------- |
| 9 | 1 file changed, 3 insertions(+), 15 deletions(-) |
| 10 | |
| 11 | diff --git a/configure.in b/configure.in |
| 12 | index d566e1c..c9ef3a6 100644 |
| 13 | --- a/configure.in |
| 14 | +++ b/configure.in |
| 15 | @@ -2102,21 +2102,9 @@ case "$use_libxml2" in |
| 16 | DST_LIBXML2_INC="" |
| 17 | ;; |
| 18 | auto|yes) |
| 19 | - case X`(xml2-config --version) 2>/dev/null` in |
| 20 | - X2.[[6789]].*) |
| 21 | - libxml2_libs=`xml2-config --libs` |
| 22 | - libxml2_cflags=`xml2-config --cflags` |
| 23 | - ;; |
| 24 | - *) |
| 25 | - libxml2_libs= |
| 26 | - libxml2_cflags= |
| 27 | - ;; |
| 28 | - esac |
| 29 | - ;; |
| 30 | - *) |
| 31 | - if test -f "$use_libxml2/bin/xml2-config" ; then |
| 32 | - libxml2_libs=`$use_libxml2/bin/xml2-config --libs` |
| 33 | - libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` |
| 34 | + if pkg-config --exists libxml-2.0 ; then |
| 35 | + libxml2_libs=`pkg-config libxml-2.0 --libs` |
| 36 | + libxml2_cflags=`pkg-config libxml-2.0 --cflags` |
| 37 | fi |
| 38 | ;; |
| 39 | esac |
| 40 | -- |
| 41 | 2.1.4 |
| 42 | |