archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update ext/xmlreader dependencies (#14572)

Browse source 
- ext/dom is optional (using HAVE_DOM for cases when dom is build as
  a shared extension to make it required in that case)
- ext/libxml is required
This commit is contained in:
Peter Kokot 2024-06-15 16:25:26 +02:00 • committed by GitHub
parent 6a2c5318f9
commit dd4e2ef5b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/xmlreader/config.m4
View file

@ -5,15 +5,11 @@ PHP_ARG_ENABLE([xmlreader],
[yes]) [yes])
if test "$PHP_XMLREADER" != "no"; then if test "$PHP_XMLREADER" != "no"; then
if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add --with-libxml])
fi
PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [ PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
AC_DEFINE(HAVE_XMLREADER,1,[ ]) AC_DEFINE(HAVE_XMLREADER,1,[ ])
PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared) PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared)
PHP_ADD_EXTENSION_DEP(xmlreader, dom, true) PHP_ADD_EXTENSION_DEP(xmlreader, dom, true)
PHP_ADD_EXTENSION_DEP(xmlreader, libxml)
PHP_SUBST(XMLREADER_SHARED_LIBADD) PHP_SUBST(XMLREADER_SHARED_LIBADD)
]) ])
fi fi

2
ext/xmlreader/config.w32
View file

@ -12,6 +12,6 @@ if (PHP_XMLREADER == "yes" &&
if (!PHP_XMLREADER_SHARED) { if (!PHP_XMLREADER_SHARED) {
ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC"); ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC");
} }
ADD_EXTENSION_DEP('xmlreader', 'dom', true);
ADD_EXTENSION_DEP('xmlreader', 'libxml'); ADD_EXTENSION_DEP('xmlreader', 'libxml');
ADD_EXTENSION_DEP('xmlreader', 'dom');
} }

3
ext/xmlreader/php_xmlreader.c
View file

@ -277,6 +277,9 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz
#endif #endif
static const zend_module_dep xmlreader_deps[] = { static const zend_module_dep xmlreader_deps[] = {
#ifdef HAVE_DOM
ZEND_MOD_REQUIRED("dom")
#endif
ZEND_MOD_REQUIRED("libxml") ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_END ZEND_MOD_END
}; };