Skip to content

Update ext/xmlreader dependencies #14572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2024
Merged

Update ext/xmlreader dependencies #14572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ext/xmlreader/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ext/xmlreader/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
3 changes: 3 additions & 0 deletions ext/xmlreader/php_xmlreader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down
Loading