From: Pierre Joye <pajoye@php.net>
Date: Fri, 26 Dec 2008 14:13:38 +0000 (+0000)
Subject: - remove the temp hack for libxml path (fixed now)
X-Git-Tag: php-5.3.0beta1~374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50d26a85a6d27602f15f3aacd5e9e964b9034cb9;p=php

- remove the temp hack for libxml path (fixed now)
- do not raise a warning if the extension was not enabled anyway
---

diff --git a/ext/simplexml/config.w32 b/ext/simplexml/config.w32
index 6c0293a938..cbf8b58c40 100644
--- a/ext/simplexml/config.w32
+++ b/ext/simplexml/config.w32
@@ -3,21 +3,20 @@
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
 
-if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes"
+if (PHP_SIMPLEXML == "yes") {
+	if(PHP_LIBXML == "yes"
 	&& ADD_EXTENSION_DEP('simplexml', 'libxml')) {
-	EXTENSION("simplexml", "simplexml.c sxe.c");
-	AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
-	if (!PHP_SIMPLEXML_SHARED) {
-		ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
-	}
-	
-	// be tricky for now, we actually need a macro like the one in m4 (PHP_SETUP_LIBXML)
-	ADD_FLAG("CFLAGS_SIMPLEXML", "$(CFLAGS_LIBXML)");
+		EXTENSION("simplexml", "simplexml.c sxe.c");
+		AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
+		if (!PHP_SIMPLEXML_SHARED) {
+			ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
+		}
 
-	if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
-		MESSAGE("\tSPL support in simplexml disabled");
+		if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
+			MESSAGE("\tSPL support in simplexml disabled");
+		}
+	} else {
+		PHP_SIMPLEXML == "no";
+		WARNING("simplexml not enabled; libraries and headers not found");
 	}
-} else {
-	PHP_SIMPLEXML == "no";
-	WARNING("simplexml not enabled; libraries and headers not found");
 }