pajoye          Fri Dec 26 14:13:38 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/simplexml      config.w32 
  Log:
  - 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.4.8.5&r2=1.4.8.6&diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.5 
php-src/ext/simplexml/config.w32:1.4.8.6
--- php-src/ext/simplexml/config.w32:1.4.8.5    Thu Dec 25 01:00:26 2008
+++ php-src/ext/simplexml/config.w32    Fri Dec 26 14:13:38 2008
@@ -1,23 +1,22 @@
-// $Id: config.w32,v 1.4.8.5 2008/12/25 01:00:26 pajoye Exp $
+// $Id: config.w32,v 1.4.8.6 2008/12/26 14:13:38 pajoye Exp $
 // vim:ft=javascript
 
 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");
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to