Skip to content

Fix #75871 - If pkg-config is available use it for libxml2 #3044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix #75871 - If pkg-config is available use it for libxml2 #3044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 53 additions & 28 deletions acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2534,15 +2534,18 @@ dnl
dnl Common setup macro for libxml
dnl
AC_DEFUN([PHP_SETUP_LIBXML], [
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
])
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
])

if test -x "$ac_cv_php_xml2_config_path"; then
XML2_CONFIG="$ac_cv_php_xml2_config_path"
Expand All @@ -2553,30 +2556,52 @@ AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
IFS=$ac_IFS
LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
if test "$LIBXML_VERSION" -ge "2006011"; then
found_libxml=yes
LIBXML_LIBS=`$XML2_CONFIG --libs`
LIBXML_INCS=`$XML2_CONFIG --cflags`
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
else
AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
fi
fi

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

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
])
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ if test "$PHP_DOM" != "no"; then
PHP_INSTALL_HEADERS([ext/dom/xml_common.h])
PHP_ADD_EXTENSION_DEP(dom, libxml)
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.])
])
fi
2 changes: 1 addition & 1 deletion ext/libxml/config0.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ if test "$PHP_LIBXML" != "no"; then
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([xml2-config not found. Please check your libxml2 installation.])
AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.])
])
fi
2 changes: 1 addition & 1 deletion ext/simplexml/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if test "$PHP_SIMPLEXML" != "no"; then
PHP_INSTALL_HEADERS([ext/simplexml/php_simplexml.h ext/simplexml/php_simplexml_exports.h])
PHP_SUBST(SIMPLEXML_SHARED_LIBADD)
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.])
])
PHP_ADD_EXTENSION_DEP(simplexml, libxml)
PHP_ADD_EXTENSION_DEP(simplexml, spl, true)
Expand Down
2 changes: 1 addition & 1 deletion ext/soap/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ if test "$PHP_SOAP" != "no"; then
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([xml2-config not found. Please check your libxml2 installation.])
AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.])
])
fi
2 changes: 1 addition & 1 deletion ext/wddx/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if test "$PHP_WDDX" != "no"; then
PHP_ADD_BUILD_DIR(ext/xml)
fi
], [
AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
])
fi

Expand Down
2 changes: 1 addition & 1 deletion ext/xml/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if test "$PHP_XML" != "no"; then
xml_extra_sources="compat.c"
PHP_ADD_EXTENSION_DEP(xml, libxml)
], [
AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
])
fi

Expand Down
2 changes: 1 addition & 1 deletion ext/xmlreader/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ if test "$PHP_XMLREADER" != "no"; then
PHP_ADD_EXTENSION_DEP(xmlreader, dom, true)
PHP_SUBST(XMLREADER_SHARED_LIBADD)
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.])
])
fi
2 changes: 1 addition & 1 deletion ext/xmlrpc/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if test "$PHP_XMLRPC" != "no"; then
PHP_ADD_BUILD_DIR(ext/xml)
fi
], [
AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
])
else
testval=no
Expand Down
2 changes: 1 addition & 1 deletion ext/xmlwriter/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ if test "$PHP_XMLWRITER" != "no"; then
PHP_NEW_EXTENSION(xmlwriter, php_xmlwriter.c, $ext_shared)
PHP_SUBST(XMLWRITER_SHARED_LIBADD)
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.])
])
fi