pajoye Thu Dec 25 00:00:49 2008 UTC
Modified files:
/php-src/ext/simplexml config.w32
Log:
- disable simplexml when libxml is not enabled
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.5
php-src/ext/simplexml/config.w32:1.6
--- php-src/ext/simplexml/config.w32:1.5 Thu Nov 6 00:36:28 2008
+++ php-src/ext/simplexml/config.w32 Thu Dec 25 00:00:49 2008
@@ -1,16 +1,21 @@
-// $Id: config.w32,v 1.5 2008/11/06 00:36:28 colder Exp $
+// $Id: config.w32,v 1.6 2008/12/25 00:00:49 pajoye Exp $
// vim:ft=javascript
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");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
