| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From a2d146b8dd9d02f523d1e205d79792626a71dec3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
| 3 | Date: Mon, 2 Apr 2018 15:27:09 +0800 |
| 4 | Subject: [PATCH] acinclude.m4: skip binconfig check for libxml |
| 5 | |
| 6 | We want libxml flags to be picked up using pkg-config instead of the |
| 7 | xml2-config file. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [OE-specific] |
| 10 | |
| 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 12 | |
| 13 | --- |
| 14 | acinclude.m4 | 29 ----------------------------- |
| 15 | 1 file changed, 29 deletions(-) |
| 16 | |
| 17 | diff --git a/acinclude.m4 b/acinclude.m4 |
| 18 | index d42d708..d32766a 100644 |
| 19 | --- a/acinclude.m4 |
| 20 | +++ b/acinclude.m4 |
| 21 | @@ -2525,35 +2525,6 @@ dnl |
| 22 | AC_DEFUN([PHP_SETUP_LIBXML], [ |
| 23 | found_libxml=no |
| 24 | |
| 25 | - dnl First try to find xml2-config |
| 26 | - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, |
| 27 | - [ |
| 28 | - for i in $PHP_LIBXML_DIR /usr/local /usr; do |
| 29 | - if test -x "$i/bin/xml2-config"; then |
| 30 | - ac_cv_php_xml2_config_path="$i/bin/xml2-config" |
| 31 | - break |
| 32 | - fi |
| 33 | - done |
| 34 | - ]) |
| 35 | - |
| 36 | - if test -x "$ac_cv_php_xml2_config_path"; then |
| 37 | - XML2_CONFIG="$ac_cv_php_xml2_config_path" |
| 38 | - libxml_full_version=`$XML2_CONFIG --version` |
| 39 | - ac_IFS=$IFS |
| 40 | - IFS="." |
| 41 | - set $libxml_full_version |
| 42 | - IFS=$ac_IFS |
| 43 | - LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` |
| 44 | - if test "$LIBXML_VERSION" -ge "2006011"; then |
| 45 | - found_libxml=yes |
| 46 | - LIBXML_LIBS=`$XML2_CONFIG --libs` |
| 47 | - LIBXML_INCS=`$XML2_CONFIG --cflags` |
| 48 | - else |
| 49 | - AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) |
| 50 | - fi |
| 51 | - fi |
| 52 | - |
| 53 | - dnl If xml2-config fails, try pkg-config |
| 54 | if test "$found_libxml" = "no"; then |
| 55 | if test -z "$PKG_CONFIG"; then |
| 56 | AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |