Tweak xml related build.

Still some warnings for ext/xsl, but I'll leave that to someone else for now.

Author: wez

ext/dom/config.w32

@@ -13,6 +13,9 @@ if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
 		notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \
 		domlocator.c namednodemap.c userdatahandler.c");
 	AC_DEFINE("HAVE_DOM", 1, "DOM support");
+	if (!PHP_DOM_SHARED) {
+		ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC ");
+	}
 }
 
 

ext/libxml/config.w32

@@ -10,7 +10,8 @@ if (PHP_LIBXML == "yes") {
 
 		EXTENSION("libxml", "libxml.c", false /* never shared */);
 		AC_DEFINE("HAVE_LIBXML", 1, "LibXML support");
-		ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED /D LIBXML_STATIC ");
+		ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED");
+		ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC ");
 		if (!PHP_LIBXML_SHARED) {
 			ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
 		}

ext/simplexml/config.w32

@@ -6,6 +6,9 @@ ARG_WITH("simplexml", "Simple XML support", "yes");
 if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes") {
 	EXTENSION("simplexml", "simplexml.c");
 	AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
+	if (!PHP_SIMPLEXML_SHARED) {
+		ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
+	}
 }
 
 

ext/xml/config.w32

@@ -6,6 +6,9 @@ ARG_WITH("xml", "XML support", "yes");
 if (PHP_XML == "yes" && PHP_LIBXML == "yes") {
 	EXTENSION("xml", "xml.c compat.c");
 	AC_DEFINE("HAVE_XML", 1, "XML support");
+	if (!PHP_XML_SHARED) {
+		ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC ");
+	}
 }
 
 

ext/xsl/config.w32

@@ -5,13 +5,21 @@ ARG_WITH("xsl", "xsl support", "no");
 
 if (PHP_XSL != "no") {
 	if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
-		if (CHECK_LIB("libxslt_a.lib;libxslt.lib", "xsl", PHP_XSL) && 
-				CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {
+		var ext_xsl_lib_found = false;
+
+		if (CHECK_LIB("libxslt_a.lib", "xsl", PHP_XSL)) {
+			ADD_FLAG("CFLAGS_XSL", "/D LIBXSL_STATIC ");
+			ext_xsl_lib_found = true;
+		} else if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL)) {
+			ext_xsl_lib_found = true;
+		}
+
+		if (ext_xsl_lib_found && CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {
 
 			EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
 			AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
 			if (! PHP_XSL_SHARED) {
-				ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
+				ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS /D LIBXML_STATIC");
 			}
 		} else {
 			WARNING("xsl not enabled; libraries and headers not found");