Update ext/xmlreader dependencies (php#14572)

petk · web-flow · commit dd4e2ef5b08a · 2024-06-15T16:25:26.000+02:00
- 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
diff --git 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
@@ -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
@@ -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
 };

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ if (PHP_XMLREADER == "yes" &&`
`12`	`12`	`if (!PHP_XMLREADER_SHARED) {`
`13`	`13`	`ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC");`
`14`	`14`	`}`
	`15`	`+ ADD_EXTENSION_DEP('xmlreader', 'dom', true);`
`15`	`16`	`ADD_EXTENSION_DEP('xmlreader', 'libxml');`
`16`		`- ADD_EXTENSION_DEP('xmlreader', 'dom');`
`17`	`17`	`}`