MFB: enable exslt support for win32 builds

WS fixes for exslt tests

3 files changed, 68 insertions, 58 deletions

diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32
index 2a92a7b037..37da4bd630 100644
--- a/ext/xsl/config.w32
+++ b/ext/xsl/config.w32
@@ -6,16 +6,28 @@ ARG_WITH("xsl", "xsl support", "no");
 if (PHP_XSL != "no") {
 	if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
 		var ext_xsl_lib_found = false;
+		var ext_exslt_lib_found = false;
 
 		if (CHECK_LIB("libxslt_a.lib", "xsl", PHP_XSL)) {
-			ADD_FLAG("CFLAGS_XSL", "/D LIBXSLT_STATIC ");
 			ext_xsl_lib_found = true;
+			ADD_FLAG("CFLAGS_XSL", "/D LIBXSLT_STATIC ");
+			if (CHECK_LIB("libexslt_a.lib", "xsl", PHP_XSL)) {
+				ADD_FLAG("CFLAGS_XSL", "/D LIBEXSLT_STATIC ");
+				ext_exslt_lib_found = true;
+			}
 		} else if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL)) {
 			ext_xsl_lib_found = true;
+			if (CHECK_LIB("libexslt.lib", "xsl", PHP_XSL)) {
+				ext_exslt_lib_found = true;
+			}
 		}
 
 		if (ext_xsl_lib_found && CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {
-
+			if (ext_exslt_lib_found) {
+				if (CHECK_HEADER_ADD_INCLUDE("libexslt\\exslt.h", "CFLAGS_XSL")) {
+					AC_DEFINE("HAVE_XSL_EXSLT", 1, "");
+				}
+			}
 			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) {
diff --git a/ext/xsl/tests/exslt.xml b/ext/xsl/tests/exslt.xml
index 0d9c8eb75b..54913c6f5d 100644
--- a/ext/xsl/tests/exslt.xml
+++ b/ext/xsl/tests/exslt.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>

-<page>

-  <!-- valid xs:date -->

-  <date date="0001-12-31Z"/>

-  <date date="3000-01-31"/>

-  <date date="2000-02-29"/>

-  <date date="9990001-12-31Z"/>

-  <date date="-0004-02-29"/>

-</page>

-

+<?xml version="1.0"?>
+<page>
+  <!-- valid xs:date -->
+  <date date="0001-12-31Z"/>
+  <date date="3000-01-31"/>
+  <date date="2000-02-29"/>
+  <date date="9990001-12-31Z"/>
+  <date date="-0004-02-29"/>
+</page>
diff --git a/ext/xsl/tests/exslt.xsl b/ext/xsl/tests/exslt.xsl
index 06ffd8d60d..8f0baef6ca 100644
--- a/ext/xsl/tests/exslt.xsl
+++ b/ext/xsl/tests/exslt.xsl
@@ -1,46 +1,45 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<xsl:stylesheet version="1.0" 

-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

-                xmlns:date="http://exslt.org/dates-and-times"

-                extension-element-prefixes="date">

-

-<xsl:output method="text"/>

-

-<xsl:template match="date">

-  Test Date : <xsl:value-of select="@date"/>

-    <!-- dateTime, date, gYearMonth or gYear; else NaN -->

-    year                 : <xsl:value-of select="date:year(@date)"/>

-    <!-- dateTime, date, gYearMonth or gYear; else NaN -->

-    leap-year            : <xsl:value-of select="date:leap-year(@date)"/>

-    <!-- dateTime, date, gYearMonth, gMonth or gMonthDay; else NaN -->

-    month-in-year        : <xsl:value-of select="date:month-in-year(@date)"/>

-    <!-- dateTime, date, gYearMonth or gMonth; else '' -->

-    month-name           : <xsl:value-of select="date:month-name(@date)"/>

-    <!-- dateTime, date, gYearMonth or gMonth; else '' -->

-    month-abbreviation   : <xsl:value-of select="date:month-abbreviation(@date)"/>

-    <!-- dateTime or date; else NaN -->

-    week-in-year         : <xsl:value-of select="date:week-in-year(@date)"/>

-    <!-- dateTime, date; else NaN -->

-    day-in-year          : <xsl:value-of select="date:day-in-year(@date)"/>

-    <!-- dateTime, date, gMonthDay or gDay; else NaN -->

-    day-in-month         : <xsl:value-of select="date:day-in-month(@date)"/>

-    <!-- dateTime, date; else NaN -->

-    day-of-week-in-month : <xsl:value-of select="date:day-of-week-in-month(@date)"/>

-    <!-- dateTime, date; else NaN -->

-    day-in-week          : <xsl:value-of select="date:day-in-week(@date)"/>

-    <!-- dateTime or date; else NaN -->

-    day-name             : <xsl:value-of select="date:day-name(@date)"/>

-    <!-- dateTime or date; else NaN -->

-    day-abbreviation     : <xsl:value-of select="date:day-abbreviation(@date)"/>

-    <!-- dateTime or time;  else '' -->

-    time                 : <xsl:value-of select="date:time(@date)"/>

-    <!-- dateTime or time;  else NaN -->

-    hour-in-day          : <xsl:value-of select="date:hour-in-day(@date)"/>

-    <!-- dateTime or time;  else NaN -->

-    minute-in-hour       : <xsl:value-of select="date:minute-in-hour(@date)"/>

-    <!-- dateTime or time;  else NaN -->

-    second-in-minute     : <xsl:value-of select="date:second-in-minute(@date)"/>

-</xsl:template>

-

-</xsl:stylesheet>

-

+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" 
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:date="http://exslt.org/dates-and-times"
+                extension-element-prefixes="date">
+
+<xsl:output method="text"/>
+
+<xsl:template match="date">
+  Test Date : <xsl:value-of select="@date"/>
+    <!-- dateTime, date, gYearMonth or gYear; else NaN -->
+    year                 : <xsl:value-of select="date:year(@date)"/>
+    <!-- dateTime, date, gYearMonth or gYear; else NaN -->
+    leap-year            : <xsl:value-of select="date:leap-year(@date)"/>
+    <!-- dateTime, date, gYearMonth, gMonth or gMonthDay; else NaN -->
+    month-in-year        : <xsl:value-of select="date:month-in-year(@date)"/>
+    <!-- dateTime, date, gYearMonth or gMonth; else '' -->
+    month-name           : <xsl:value-of select="date:month-name(@date)"/>
+    <!-- dateTime, date, gYearMonth or gMonth; else '' -->
+    month-abbreviation   : <xsl:value-of select="date:month-abbreviation(@date)"/>
+    <!-- dateTime or date; else NaN -->
+    week-in-year         : <xsl:value-of select="date:week-in-year(@date)"/>
+    <!-- dateTime, date; else NaN -->
+    day-in-year          : <xsl:value-of select="date:day-in-year(@date)"/>
+    <!-- dateTime, date, gMonthDay or gDay; else NaN -->
+    day-in-month         : <xsl:value-of select="date:day-in-month(@date)"/>
+    <!-- dateTime, date; else NaN -->
+    day-of-week-in-month : <xsl:value-of select="date:day-of-week-in-month(@date)"/>
+    <!-- dateTime, date; else NaN -->
+    day-in-week          : <xsl:value-of select="date:day-in-week(@date)"/>
+    <!-- dateTime or date; else NaN -->
+    day-name             : <xsl:value-of select="date:day-name(@date)"/>
+    <!-- dateTime or date; else NaN -->
+    day-abbreviation     : <xsl:value-of select="date:day-abbreviation(@date)"/>
+    <!-- dateTime or time;  else '' -->
+    time                 : <xsl:value-of select="date:time(@date)"/>
+    <!-- dateTime or time;  else NaN -->
+    hour-in-day          : <xsl:value-of select="date:hour-in-day(@date)"/>
+    <!-- dateTime or time;  else NaN -->
+    minute-in-hour       : <xsl:value-of select="date:minute-in-hour(@date)"/>
+    <!-- dateTime or time;  else NaN -->
+    second-in-minute     : <xsl:value-of select="date:second-in-minute(@date)"/>
+</xsl:template>
+
+</xsl:stylesheet>