From: Rob Richards <rrichards@php.net>
Date: Tue, 4 Dec 2007 17:14:34 +0000 (+0000)
Subject: MFH: starting with 2.6.30, standard libxml2 build can be used
X-Git-Tag: RELEASE_1_3_1~544
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d99a820e1ebd5486c9616e00e6cc385680a3a21;p=php

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 22fae9fb6c..08a06af1f1 100644
--- 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");
 		}