From: Pierre Joye <pajoye@php.net>
Date: Thu, 25 Dec 2008 00:00:49 +0000 (+0000)
Subject: - disable simplexml when libxml is not enabled
X-Git-Tag: php-5.4.0alpha1~191^2~4755
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41f0a56f8f2228beb6d9f5b6f807d2c0cb08eec2;p=php

- disable simplexml when libxml is not enabled
---

diff --git a/ext/simplexml/config.w32 b/ext/simplexml/config.w32
index 9ffb56cd01..c003d07239 100644
--- a/ext/simplexml/config.w32
+++ b/ext/simplexml/config.w32
@@ -3,14 +3,19 @@
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
 
-if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "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");
 	}
-	ADD_EXTENSION_DEP('simplexml', 'libxml');
-	ADD_EXTENSION_DEP('simplexml', 'spl', true);
+	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");
 }