pajoye Fri Dec 26 14:16:38 2008 UTC Modified files: /php-src/ext/simplexml config.w32 Log: - MFB: - remove the temp hack for libxml path (fixed now) - do not raise a warning if the extension was not enabled anyway http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/simplexml/config.w32 diff -u php-src/ext/simplexml/config.w32:1.6 php-src/ext/simplexml/config.w32:1.7 --- php-src/ext/simplexml/config.w32:1.6 Thu Dec 25 00:00:49 2008 +++ php-src/ext/simplexml/config.w32 Fri Dec 26 14:16:38 2008 @@ -1,21 +1,22 @@ -// $Id: config.w32,v 1.6 2008/12/25 00:00:49 pajoye Exp $ +// $Id: config.w32,v 1.7 2008/12/26 14:16:38 pajoye Exp $ // vim:ft=javascript 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"); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php