# sorry for the mixing of different things in this commit

- added DOMXML_PARAM_THREE macro
- renamed domxml_dumpmem to domxml_dump_mem, added alias for
  domxml_dumpmem
- domxml_has_attributes was missing in in zend_function_entry
@- added function domxml_dump_file($filename,[$compression]). Dumps XML to
@  a file and uses compression, if specified (chregu)
@- added exslt integration (see http://exslt.org for details). To be
@  configured with --with-dom-exslt[=DIR] (and --with-dom-xslt) (chregu, jaroslaw)

1 files changed, 58 insertions, 1 deletions

diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4
index 7005a4b9c3..cbe6d9ad5c 100644
--- a/ext/domxml/config.m4
+++ b/ext/domxml/config.m4
@@ -82,10 +82,31 @@ AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
   CPPFLAGS=$old_CPPFLAGS
 ])
 
+AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=-I$DOMEXSLT_DIR/include
+  AC_MSG_CHECKING(for libexslt version)
+  AC_EGREP_CPP(yes,[
+  #include <libexslt/exsltconfig.h>
+  #if LIBEXSLT_VERSION >= 600
+  yes
+  #endif
+  ],[
+    AC_MSG_RESULT(>= 1.0.3)
+  ],[
+    AC_MSG_ERROR(libxslt version 1.0.3 or greater required.)
+  ])
+  CPPFLAGS=$old_CPPFLAGS
+])
+
 PHP_ARG_WITH(dom-xslt, for DOM XSLT support,
 [  --with-dom-xslt[=DIR]   Include DOM XSLT support (requires libxslt >= 1.0.3).
                           DIR is the libxslt install directory.])
 
+PHP_ARG_WITH(dom-exslt, for DOM EXSLT support,
+[  --with-dom-exslt[=DIR]   Include DOM EXSLT support (requires libxslt >= 1.0.3).
+                          DIR is the libexslt install directory.])
+
 if test "$PHP_DOM_XSLT" != "no"; then
 
   if test -r $PHP_DOM_XSLT/include/libxslt/transform.h; then
@@ -104,12 +125,48 @@ if test "$PHP_DOM_XSLT" != "no"; then
   PHP_DOM_XSLT_CHECK_VERSION
 
   PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD)
+
   PHP_ADD_INCLUDE($DOMXSLT_DIR/include)
 
-  if test "$DOMXML_DIR" = "no"; then
+  if test "$PHP_DOM" = "no"; then
     AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)
   fi
   
   AC_DEFINE(HAVE_DOMXSLT,1,[ ])
+  
+  PHP_SUBST(DOMXML_SHARED_LIBADD)
+fi
+
+if test "$PHP_DOM_EXSLT" != "no"; then
+  if test "$PHP_DOM" = "no"; then
+    AC_MSG_ERROR(DOMEXSLT requires DOMXML. Use --with-dom=<DIR>)
+  fi
+
+  if test "$PHP_DOM_XSLT" = "no"; then
+    AC_MSG_ERROR(DOMEXSLT requires DOMXSLT. Use --with-dom-xslt=<DIR>)
+  fi
+  
+  if test -r $PHP_DOM_EXSLT/include/libexslt/exslt.h; then
+    DOMEXSLT_DIR=$PHP_DOM_EXSLT
+  else
+    for i in /usr/local /usr; do
+      test -r $i/include/libexslt/exslt.h && DOMEXSLT_DIR=$i
+    done
+  fi
+
+  if test -z "$DOMEXSLT_DIR"; then
+    AC_MSG_RESULT(not found)
+    AC_MSG_ERROR(Please reinstall the libxslt >= 1.0.3 distribution)
+  fi
+
+  PHP_DOM_EXSLT_CHECK_VERSION
+
+  PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD)
+
+  PHP_ADD_INCLUDE($DOMEXSLT_DIR/include)
+
+  AC_DEFINE(HAVE_DOMEXSLT,1,[ ])
+
   PHP_SUBST(DOMXML_SHARED_LIBADD)
+
 fi