From: Pierre Joye <pajoye@php.net>
Date: Fri, 26 Dec 2008 14:16:38 +0000 (+0000)
Subject: - MFB:
X-Git-Tag: php-5.4.0alpha1~191^2~4745
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=435de704811be592b3258397b2be5377b439a8d7;p=php

- MFB:
  - 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 c003d07239..1166052b7a 100644
--- a/ext/simplexml/config.w32
+++ b/ext/simplexml/config.w32
@@ -3,19 +3,20 @@
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
 
-if (PHP_SIMPLEXML == "yes" && 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");
+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");
+		}
+		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");
 	}
-	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");
 }