php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ext/simplexml dependencies (#14446)

Browse Source 
This syncs the configure time dependencies for ext/simplexml:
- ext/spl was once optional but since being always available,
  conditional usage was removed
- ext/libxml required
This commit is contained in:
Peter Kokot
2024-06-02 23:37:50 +02:00
committed by GitHub
parent 354b2636a5
commit 5afe41bdf3
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/simplexml/config.m4
View File

@@ -5,17 +5,12 @@ PHP_ARG_ENABLE([simplexml],
[yes])
if test "$PHP_SIMPLEXML" != "no"; then
if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --with-libxml])
fi
PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
AC_DEFINE(HAVE_SIMPLEXML,1,[ ])
PHP_NEW_EXTENSION(simplexml, simplexml.c, $ext_shared)
PHP_ADD_EXTENSION_DEP(simplexml, libxml)
PHP_ADD_EXTENSION_DEP(simplexml, spl)
PHP_INSTALL_HEADERS([ext/simplexml], [php_simplexml.h php_simplexml_exports.h])
PHP_SUBST(SIMPLEXML_SHARED_LIBADD)
])
PHP_ADD_EXTENSION_DEP(simplexml, libxml)
PHP_ADD_EXTENSION_DEP(simplexml, spl, true)
fi

4
ext/simplexml/config.w32
View File

@@ -5,6 +5,7 @@ ARG_WITH("simplexml", "Simple XML support", "yes");
if (PHP_SIMPLEXML == "yes") {
if(PHP_LIBXML == "yes" &&
ADD_EXTENSION_DEP('simplexml', 'libxml') &&
ADD_EXTENSION_DEP('simplexml', 'spl') &&
CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_SIMPLEXML", PHP_PHP_BUILD + "\\include\\libxml2")
) {
EXTENSION("simplexml", "simplexml.c");
@@ -17,9 +18,6 @@ if (PHP_SIMPLEXML == "yes") {
}
}
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE("\tSPL support in simplexml disabled");
}
ADD_FLAG("CFLAGS_SIMPLEXML", "/D PHP_SIMPLEXML_EXPORTS ");
PHP_INSTALL_HEADERS("ext/simplexml", "php_simplexml.h php_simplexml_exports.h");
} else {