cvs: php4 /ext/xslt config.m4

sniper Thu Aug 29 23:52:40 2002 EDT Modified files: /php4/ext/xslt config.m4 Log: Fix shared build Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.25 php4/ext/xslt/config.m4:1.26 --- php4/ext/xslt/config.m4:1.25 Thu May 2 06:22:25 2002 +++ php4/ext/xslt/config.m4 Thu Aug 29 23:52:40 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2002/05/02 10:22:25 sniper Exp $ +dnl $Id: config.m4,v 1.26 2002/08/30 03:52:40 sniper Exp $ dnl dnl +------------------------------------------------------------------------------+ dnl | This is where the magic of the extension reallly is. Depending on what | @@ -9,18 +9,31 @@ 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 @@ -67,6 +80,10 @@ if test "$found_expat" = "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