From 5c66dc46c9527125100a2892e1a5722045cb6320 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 15 Jun 2024 00:08:51 +0200 Subject: [PATCH] Update ext/xmlreader dependencies - 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 --- ext/xmlreader/config.m4 | 6 +----- ext/xmlreader/config.w32 | 2 +- ext/xmlreader/php_xmlreader.c | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4 index 8777d93ba9cda..f3adc868e309f 100644 --- a/ext/xmlreader/config.m4 +++ b/ext/xmlreader/config.m4 @@ -5,15 +5,11 @@ PHP_ARG_ENABLE([xmlreader], [yes]) 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, [ AC_DEFINE(HAVE_XMLREADER,1,[ ]) PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared) PHP_ADD_EXTENSION_DEP(xmlreader, dom, true) + PHP_ADD_EXTENSION_DEP(xmlreader, libxml) PHP_SUBST(XMLREADER_SHARED_LIBADD) ]) fi diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32 index b9ab7dbe030ca..059381dbffebe 100644 --- a/ext/xmlreader/config.w32 +++ b/ext/xmlreader/config.w32 @@ -12,6 +12,6 @@ if (PHP_XMLREADER == "yes" && if (!PHP_XMLREADER_SHARED) { ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC"); } + ADD_EXTENSION_DEP('xmlreader', 'dom', true); ADD_EXTENSION_DEP('xmlreader', 'libxml'); - ADD_EXTENSION_DEP('xmlreader', 'dom'); } diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 48c9de2996d6d..4d63f9af8b251 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -277,6 +277,9 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz #endif static const zend_module_dep xmlreader_deps[] = { +#ifdef HAVE_DOM + ZEND_MOD_REQUIRED("dom") +#endif ZEND_MOD_REQUIRED("libxml") ZEND_MOD_END };