- 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 6c0293a938915c5db0f2eb3511cfe721f186ffda..cbf8b58c403a384cd032e1cbc743955539157526 100644 (file)
--- a/ext/simplexml/config.w32
+++ b/ext/simplexml/config.w32
@@ -3,21 +3,20 @@
 
 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");
 }