mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
dc8f18af0b
The xmlDictPtr was moved before the includes in libxml2 2.9.4 so the <libxml/dict.h> can be included directly but for earlier versions the <libxml/tree.h> needs to be included before. Since PHP requires libxml2 2.9.0 or later and this also fixes builds on Solaris 10. As earlier 2.9.0-2.9.3 libxml2 versions also include several security issues, this change bumps the required minimum libxml2 version to 2.9.4 On Windows, a check for minimum libxml2 version is also added. Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
30 lines
1.3 KiB
JavaScript
30 lines
1.3 KiB
JavaScript
// vim:ft=javascript
|
|
|
|
ARG_WITH("libxml", "LibXML support", "yes");
|
|
|
|
if (PHP_LIBXML == "yes") {
|
|
if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
|
|
CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") &&
|
|
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML", PHP_PHP_BUILD + "\\include\\libxml2") &&
|
|
CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_LIBXML", PHP_PHP_BUILD + "\\include\\libxml2") &&
|
|
ADD_EXTENSION_DEP('libxml', 'iconv')) {
|
|
|
|
if (GREP_HEADER("libxml/xmlversion.h", "#define\\s+LIBXML_VERSION\\s+(\\d+)", PHP_PHP_BUILD + "\\include\\libxml2") &&
|
|
+RegExp.$1 >= 20904) {
|
|
|
|
EXTENSION("libxml", "libxml.c mime_sniff.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
|
|
AC_DEFINE("HAVE_LIBXML", 1, "Define to 1 if the PHP extension 'libxml' is available.");
|
|
ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC /D LIBXML_STATIC_FOR_DLL /D HAVE_WIN32_THREADS ");
|
|
if (!PHP_LIBXML_SHARED) {
|
|
ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
|
|
}
|
|
PHP_INSTALL_HEADERS("ext/libxml", "php_libxml.h");
|
|
} else {
|
|
WARNING("libxml support can't be enabled, libxml version >= 2.9.4 required");
|
|
}
|
|
} else {
|
|
WARNING("libxml support can't be enabled, iconv or libxml are missing")
|
|
PHP_LIBXML = "no"
|
|
}
|
|
}
|