rrichards               Thu Dec  4 08:32:22 2003 EDT

  Modified files:              
    /php-src/ext/xsl    config.w32 
  Log:
  test for dom extension
  
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.2 php-src/ext/xsl/config.w32:1.3
--- php-src/ext/xsl/config.w32:1.2      Thu Dec  4 07:46:20 2003
+++ php-src/ext/xsl/config.w32  Thu Dec  4 08:32:22 2003
@@ -1,18 +1,22 @@
-// $Id: config.w32,v 1.2 2003/12/04 12:46:20 rrichards Exp $
+// $Id: config.w32,v 1.3 2003/12/04 13:32:22 rrichards Exp $
 // vim: ft=javascript
 
 ARG_WITH("xsl", "xsl support", "no");
 
 if (PHP_XSL != "no") {
-       if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && 
-                       CHECK_LIB("libxml2.lib", "xsl") &&
-                       CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {
-               EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
-               AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
-               if (! PHP_XSL_SHARED) {
-                       ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
+       if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
+               if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && 
+                               CHECK_LIB("libxml2.lib", "xsl") &&
+                               CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", 
"CFLAGS_XSL")) {
+                       EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
+                       AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
+                       if (! PHP_XSL_SHARED) {
+                               ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
+                       }
+               } else {
+                       WARNING("xsl not enabled; libraries and headers not found");
                }
        } else {
-               WARNING("xsl not enabled; libraries and headers not found");
+               WARNING("xsl not enabled; DOM extension required");
        }
 }

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

Reply via email to