Fix shared build

diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4
index 358e5c29c8a0d76a28ebf98836518be404679605..d8a1cea04a37a2df182c592322878375ad4974b2 100644 (file)
--- a/ext/xslt/config.m4
+++ b/ext/xslt/config.m4
@@ -9,18 +9,31 @@ dnl +---------------------------------------------------------------------------
 PHP_ARG_ENABLE(xslt, whether to enable xslt support,
 [  --enable-xslt           Enable xslt support.])
 
+xslt_ext_shared=$ext_shared
+
 PHP_ARG_WITH(xslt-sablot, for XSLT Sablotron backend,
 [  --with-xslt-sablot=DIR    XSLT: Enable the sablotron backend.])
 
-PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron XSL support,
-[  --with-expat-dir=DIR      XSLT: libexpat dir for Sablotron])
+PHP_ARG_WITH(expat-dir, for libexpat dir for Sablotron XSL support,
+[  --with-expat-dir=DIR      XSLT: libexpat dir for Sablotron.])
+
+PHP_ARG_WITH(iconv-dir, for iconv dir for Sablotron XSL support,
+[  --with-iconv-dir=DIR      XSLT: iconv dir for Sablotron.])
 
-PHP_ARG_WITH(sablot-js, enable JavaScript for Sablotron,
-[  --with-sablot-js=DIR    Sablotron: enable JavaScript support for Sablotron])
+dnl This configure option is optional. 
+AC_MSG_CHECKING([for JavaScript for Sablotron XSL support])
+AC_ARG_WITH(sablot-js,
+[  --with-sablot-js=DIR      XSLT: enable JavaScript support for Sablotron.],[
+  PHP_SABLOT_JS=$withval
+  AC_MSG_RESULT(yes)
+], [
+  PHP_SABLOT_JS=no
+  AC_MSG_RESULT(no)
+])
 
 if test "$PHP_XSLT" != "no"; then
 
-  PHP_NEW_EXTENSION(xslt, xslt.c sablot.c, $ext_shared)
+  PHP_NEW_EXTENSION(xslt, xslt.c sablot.c, $xslt_ext_shared)
   PHP_SUBST(XSLT_SHARED_LIBADD)
 
   if test "$PHP_XSLT_SABLOT" != "no"; then
@@ -69,6 +82,10 @@ if test "$PHP_XSLT" != "no"; then
       AC_MSG_ERROR([expat not found. To build sablotron you need the expat library.])
     fi
 
+    if test "$PHP_ICONV_DIR" != "no"; then
+      PHP_ICONV=$PHP_ICONV_DIR
+    fi
+
     if test "$PHP_ICONV" = "no"; then
       PHP_ICONV=yes
     fi