Skip to content

Commit dd4e2ef

Browse files
authored
Update ext/xmlreader dependencies (#14572)
- 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
1 parent 6a2c531 commit dd4e2ef

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

ext/xmlreader/config.m4

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ PHP_ARG_ENABLE([xmlreader],
55
[yes])
66

77
if test "$PHP_XMLREADER" != "no"; then
8-
9-
if test "$PHP_LIBXML" = "no"; then
10-
AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add --with-libxml])
11-
fi
12-
138
PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
149
AC_DEFINE(HAVE_XMLREADER,1,[ ])
1510
PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared)
1611
PHP_ADD_EXTENSION_DEP(xmlreader, dom, true)
12+
PHP_ADD_EXTENSION_DEP(xmlreader, libxml)
1713
PHP_SUBST(XMLREADER_SHARED_LIBADD)
1814
])
1915
fi

ext/xmlreader/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ if (PHP_XMLREADER == "yes" &&
1212
if (!PHP_XMLREADER_SHARED) {
1313
ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC");
1414
}
15+
ADD_EXTENSION_DEP('xmlreader', 'dom', true);
1516
ADD_EXTENSION_DEP('xmlreader', 'libxml');
16-
ADD_EXTENSION_DEP('xmlreader', 'dom');
1717
}

ext/xmlreader/php_xmlreader.c

+3
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz
277277
#endif
278278

279279
static const zend_module_dep xmlreader_deps[] = {
280+
#ifdef HAVE_DOM
281+
ZEND_MOD_REQUIRED("dom")
282+
#endif
280283
ZEND_MOD_REQUIRED("libxml")
281284
ZEND_MOD_END
282285
};

0 commit comments

Comments
 (0)