MFH: starting with 2.6.30, standard libxml2 build can be used

diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
index 22fae9fb6c7c20637d43c54a8c1aa277e404c368..08a06af1f1ef78a8f30c73e732484d77f2f4731a 100644 (file)
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@ -4,13 +4,13 @@
 ARG_WITH("libxml", "LibXML support", "yes");
 
 if (PHP_LIBXML == "yes") {
-       if (CHECK_LIB("libxml2_a.lib;libxml2.lib", "libxml") &&
+       if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
                        CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") &&
                        CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) {
 
                EXTENSION("libxml", "libxml.c", false /* never shared */);
                AC_DEFINE("HAVE_LIBXML", 1, "LibXML support");
-               ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC ");
+               ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC /D LIBXML_STATIC_FOR_DLL ");
                if (!PHP_LIBXML_SHARED) {
                        ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
                }