From: Hugh McMaster Date: Wed, 17 Apr 2019 11:07:15 +0000 (+1000) Subject: Use PKG_CHECK_MODULES to detect libxml2 X-Git-Tag: php-7.4.0alpha1~464 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc930cdd75cc67f1f96177c0b24c2b1318680a78;p=php Use PKG_CHECK_MODULES to detect libxml2 --- diff --git a/acinclude.m4 b/acinclude.m4 index 6a60908cba..3c372439c0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2091,76 +2091,14 @@ dnl dnl Common setup macro for libxml dnl AC_DEFUN([PHP_SETUP_LIBXML], [ - found_libxml=no - - dnl First try to find xml2-config - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ - for i in $PHP_LIBXML_DIR /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" - break - fi - done - ]) + PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.7.6]) - if test -x "$ac_cv_php_xml2_config_path"; then - XML2_CONFIG="$ac_cv_php_xml2_config_path" - libxml_full_version=`$XML2_CONFIG --version` - ac_IFS=$IFS - IFS="." - set $libxml_full_version - IFS=$ac_IFS - LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` - if test "$LIBXML_VERSION" -ge "2007006"; then - found_libxml=yes - LIBXML_LIBS=`$XML2_CONFIG --libs` - LIBXML_INCS=`$XML2_CONFIG --cflags` - else - AC_MSG_ERROR([libxml2 version 2.7.6 or greater required.]) - fi - fi + PHP_EVAL_INCLINE($LIBXML_CFLAGS) + PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) - dnl If xml2-config fails, try pkg-config - if test "$found_libxml" = "no"; then - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi + AC_DEFINE(HAVE_LIBXML, 1, [ ]) - dnl If pkg-config is found try using it - if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libxml-2.0; then - if $PKG_CONFIG --atleast-version=2.6.11 libxml-2.0; then - found_libxml=yes - LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0` - LIBXML_INCS=`$PKG_CONFIG --cflags-only-I libxml-2.0` - else - AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) - fi - fi - fi - - if test "$found_libxml" = "yes"; then - PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) - PHP_EVAL_INCLINE($LIBXML_INCS) - - dnl Check that build works with given libs - AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [ - PHP_TEST_BUILD(xmlInitParser, - [ - php_cv_libxml_build_works=yes - ], [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([build test failed. Please check the config.log for details.]) - ], [ - [$]$1 - ]) - ]) - if test "$php_cv_libxml_build_works" = "yes"; then - AC_DEFINE(HAVE_LIBXML, 1, [ ]) - fi - $2 -ifelse([$3],[],,[else $3]) - fi + $2 ]) dnl ------------------------------------------------------------------------- diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index a2406f54ad..a14f27254a 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -28,7 +28,5 @@ if test "$PHP_DOM" != "no"; then PHP_SUBST(DOM_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/dom/xml_common.h]) PHP_ADD_EXTENSION_DEP(dom, libxml) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) fi diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4 index c16324266e..2712010323 100644 --- a/ext/libxml/config0.m4 +++ b/ext/libxml/config0.m4 @@ -15,7 +15,5 @@ if test "$PHP_LIBXML" != "no"; then AC_DEFINE(HAVE_LIBXML,1,[ ]) PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/libxml/php_libxml.h]) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) fi diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4 index 1db02c4da2..d9fe11f8bf 100644 --- a/ext/simplexml/config.m4 +++ b/ext/simplexml/config.m4 @@ -17,8 +17,6 @@ if test "$PHP_SIMPLEXML" != "no"; then PHP_NEW_EXTENSION(simplexml, simplexml.c sxe.c, $ext_shared) PHP_INSTALL_HEADERS([ext/simplexml/php_simplexml.h ext/simplexml/php_simplexml_exports.h]) PHP_SUBST(SIMPLEXML_SHARED_LIBADD) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) PHP_ADD_EXTENSION_DEP(simplexml, libxml) PHP_ADD_EXTENSION_DEP(simplexml, spl, true) diff --git a/ext/soap/config.m4 b/ext/soap/config.m4 index 8a3d791741..0664fb886c 100644 --- a/ext/soap/config.m4 +++ b/ext/soap/config.m4 @@ -15,7 +15,5 @@ if test "$PHP_SOAP" != "no"; then AC_DEFINE(HAVE_SOAP,1,[ ]) PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(SOAP_SHARED_LIBADD) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) fi diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 40110fd9ad..7c039efd81 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -27,8 +27,6 @@ if test "$PHP_XML" != "no"; then PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [ xml_extra_sources="compat.c" PHP_ADD_EXTENSION_DEP(xml, libxml) - ], [ - AC_MSG_ERROR([libxml2 not found.]) ]) fi diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4 index 07be219d42..d960839966 100644 --- a/ext/xmlreader/config.m4 +++ b/ext/xmlreader/config.m4 @@ -17,7 +17,5 @@ if test "$PHP_XMLREADER" != "no"; then PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared) PHP_ADD_EXTENSION_DEP(xmlreader, dom, true) PHP_SUBST(XMLREADER_SHARED_LIBADD) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) fi diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index caf8c8286a..c7ab37c897 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -44,8 +44,6 @@ if test "$PHP_XMLRPC" != "no"; then PHP_ADD_SOURCES(ext/xml, compat.c) PHP_ADD_BUILD_DIR(ext/xml) fi - ], [ - AC_MSG_ERROR([libxml2 not found.]) ]) else testval=no diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4 index 73e0bc0438..142420b20e 100644 --- a/ext/xmlwriter/config.m4 +++ b/ext/xmlwriter/config.m4 @@ -16,7 +16,5 @@ if test "$PHP_XMLWRITER" != "no"; then AC_DEFINE(HAVE_XMLWRITER,1,[ ]) PHP_NEW_EXTENSION(xmlwriter, php_xmlwriter.c, $ext_shared) PHP_SUBST(XMLWRITER_SHARED_LIBADD) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) fi