cvs: php4 / acinclude.m4 configure.in /ext/curl config.m4 /ext/domxml config.m4 /ext/gd config.m4 /ext/mbstring config.m4 /ext/mysql config.m4
/ext/pdf config.m4 /ext/session config.m4 /ext/xml config.m4 /ext/xmlrpc config.m4 /ext/xslt config.m4 /ext/zlib config0.m4 /sapi/cgi config.m4
/sapi/pi3web config.m4

sniper Wed Sep 4 14:47:27 2002 EDT Modified files: /php4 acinclude.m4 configure.in /php4/ext/curl config.m4 /php4/ext/domxml config.m4 /php4/ext/gd config.m4 /php4/ext/mbstring config.m4 /php4/ext/mysql config.m4 /php4/ext/pdf config.m4 /php4/ext/session config.m4 /php4/ext/xml config.m4 /php4/ext/xmlrpc config.m4 /php4/ext/xslt config.m4 /php4/ext/zlib config0.m4 /php4/sapi/cgi config.m4 /php4/sapi/pi3web config.m4 Log: @- Added --disable-all configure option. (Jani)

Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.203 php4/acinclude.m4:1.204 --- php4/acinclude.m4:1.203 Thu Aug 22 18:28:19 2002 +++ php4/acinclude.m4 Wed Sep 4 14:47:20 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.203 2002/08/22 22:28:19 wez Exp $ +dnl $Id: acinclude.m4,v 1.204 2002/09/04 18:47:20 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -280,7 +280,7 @@ esac done ]) - + AC_DEFUN(PHP_READDIR_R_TYPE,[ dnl HAVE_READDIR_R is also defined by libmysql AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no) @@ -512,40 +512,58 @@ ]) AC_DEFUN(PHP_ARG_ANALYZE,[ -PHP_ARG_ANALYZE_EX([$1]) +ifelse([$3],yes,[PHP_ARG_ANALYZE_EX([$1])]) ifelse([$2],,,[AC_MSG_RESULT([$ext_output])]) ]) dnl -dnl PHP_ARG_WITH(arg-name, check message, help text[, default-val]) +dnl PHP_ARG_WITH(arg-name, check message, help text[, default-val[, extension-or-not]]) dnl Sets PHP_ARG_NAME either to the user value or to the default value. dnl default-val defaults to no. This will also set the variable ext_shared, dnl and will overwrite any previous variable of that name. +dnl If extension-or-not is yes (default), then do the ENABLE_ALL check and run +dnl the PHP_ARG_ANALYZE_EX. dnl AC_DEFUN(PHP_ARG_WITH,[ -PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)) +PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_),[ifelse($5,,yes,$5)]) ]) AC_DEFUN(PHP_REAL_ARG_WITH,[ ifelse([$2],,,[AC_MSG_CHECKING([$2])]) -AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4)) -PHP_ARG_ANALYZE($5,[$2]) +AC_ARG_WITH($1,[$3],$5=[$]withval, +[ + $5=ifelse($4,,no,$4) + + if test "$PHP_ENABLE_ALL" && test "$6" = "yes"; then + $5=$PHP_ENABLE_ALL + fi +]) +PHP_ARG_ANALYZE($5,[$2],$6) ]) dnl -dnl PHP_ARG_ENABLE(arg-name, check message, help text[, default-val]) +dnl PHP_ARG_ENABLE(arg-name, check message, help text[, default-val[, extension-or-not]]) dnl Sets PHP_ARG_NAME either to the user value or to the default value. dnl default-val defaults to no. This will also set the variable ext_shared, dnl and will overwrite any previous variable of that name. +dnl If extension-or-not is yes (default), then do the ENABLE_ALL check and run +dnl the PHP_ARG_ANALYZE_EX. dnl AC_DEFUN(PHP_ARG_ENABLE,[ -PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_)) +PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_),[ifelse($5,,yes,$5)]) ]) AC_DEFUN(PHP_REAL_ARG_ENABLE,[ ifelse([$2],,,[AC_MSG_CHECKING([$2])]) -AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4)) -PHP_ARG_ANALYZE($5,[$2]) +AC_ARG_ENABLE($1,[$3],$5=[$]enableval, +[ + $5=ifelse($4,,no,$4) + + if test "$PHP_ENABLE_ALL" && test "$6" = "yes"; then + $5=$PHP_ENABLE_ALL + fi +]) +PHP_ARG_ANALYZE($5,[$2],$6) ]) AC_DEFUN(PHP_MODULE_PTR,[ Index: php4/configure.in diff -u php4/configure.in:1.370 php4/configure.in:1.371 --- php4/configure.in:1.370 Wed Aug 21 08:40:40 2002 +++ php4/configure.in Wed Sep 4 14:47:21 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.370 2002/08/21 12:40:40 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.371 2002/09/04 18:47:21 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -531,7 +531,7 @@ PHP_HELP_SEPARATOR([General settings:]) PHP_ARG_ENABLE(debug, whether to include debugging symbols, -[ --enable-debug Compile with debugging symbols.], no) +[ --enable-debug Compile with debugging symbols.], no, no) if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1 @@ -543,7 +543,7 @@ PHP_ARG_WITH(layout,[layout of installed files], [ --with-layout=TYPE Sets how installed files will be laid out. Type is - one of "PHP" (default) or "GNU"], PHP) + one of "PHP" (default) or "GNU"], PHP, no) case $PHP_LAYOUT in GNU) @@ -557,7 +557,7 @@ PHP_ARG_WITH(config-file-path,[path to configuration file], [ --with-config-file-path=PATH Sets the path in which to look for php.ini, - defaults to PREFIX/lib], DEFAULT) + defaults to PREFIX/lib], DEFAULT, no) if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then case $PHP_LAYOUT in @@ -577,7 +577,7 @@ PHP_ARG_WITH(pear, [whether to install PEAR, and where], [ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php) - --without-pear Do not install PEAR], DEFAULT) + --without-pear Do not install PEAR], DEFAULT, no) if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then install_pear="install-pear install-build install-headers install-programs" @@ -594,7 +594,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" PHP_ARG_ENABLE(safe-mode, whether to enable safe mode by default, -[ --enable-safe-mode Enable safe mode by default.]) +[ --enable-safe-mode Enable safe mode by default.], no, no) if test "$PHP_SAFE_MODE" = "yes"; then AC_DEFINE(PHP_SAFE_MODE,1,[ ]) @@ -624,16 +624,8 @@ AC_MSG_RESULT([/usr/local/php/bin]) ]) -PHP_ARG_WITH(openssl,for OpenSSL support, -[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.5) ]) - -if test "$PHP_OPENSSL" != "no"; then - ext_openssl_shared=$ext_shared - PHP_SETUP_OPENSSL -fi - PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler, -[ --enable-sigchild Enable PHP's own SIGCHLD handler.],no) +[ --enable-sigchild Enable PHP's own SIGCHLD handler.], no, no) if test "$PHP_SIGCHILD" = "yes"; then AC_DEFINE(PHP_SIGCHILD, 1, [ ]) @@ -642,7 +634,7 @@ fi PHP_ARG_ENABLE(magic-quotes,whether to enable magic quotes by default, -[ --enable-magic-quotes Enable magic quotes by default.]) +[ --enable-magic-quotes Enable magic quotes by default.], no, no) if test "$PHP_MAGIC_QUOTES" = "yes"; then AC_DEFINE(MAGIC_QUOTES, 1, [ ]) @@ -652,10 +644,10 @@ PHP_ARG_ENABLE(rpath, whether to enable runpaths, [ --disable-rpath Disable passing additional runtime library - search paths], yes) + search paths], yes, no) PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc, -[ --enable-libgcc Enable explicitly linking against libgcc]) +[ --enable-libgcc Enable explicitly linking against libgcc], no, no) if test "$PHP_LIBGCC" = "yes"; then PHP_LIBGCC_LIBPATH(gcc) @@ -667,7 +659,7 @@ fi PHP_ARG_ENABLE(short-tags,whether to enable short tags by default, -[ --disable-short-tags Disable the short-form <? start tag by default.],yes) +[ --disable-short-tags Disable the short-form <? start tag by default.],yes, no) if test "$PHP_SHORT_TAGS" = "yes"; then AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"1",[ ]) @@ -675,9 +667,8 @@ AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"0",[ ]) fi - PHP_ARG_ENABLE(dmalloc,whether to enable dmalloc, -[ --enable-dmalloc Enable dmalloc]) +[ --enable-dmalloc Enable dmalloc], no, no) if test "$PHP_DMALLOC" = "yes"; then @@ -691,27 +682,36 @@ fi PHP_ARG_ENABLE(ipv6,whether to enable IPv6 support, -[ --disable-ipv6 Disable IPv6 support],yes) +[ --disable-ipv6 Disable IPv6 support], yes, no) if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) fi + +dnl +dnl OpenSSL configure +dnl +PHP_ARG_WITH(openssl,for OpenSSL support, +[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.5) ]) + +if test "$PHP_OPENSSL" != "no"; then + ext_openssl_shared=$ext_shared + PHP_SETUP_OPENSSL +fi + + AC_CHECK_LIB(crypt, crypt, [ PHP_ADD_LIBRARY(crypt) PHP_ADD_LIBRARY(crypt, 1) AC_DEFINE(HAVE_CRYPT,1,[ ]) ]) - - divert(5) dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. - - dnl Extension configuration. dnl ------------------------------------------------------------------------- @@ -728,6 +728,17 @@ ]) PHP_CONFIGURE_PART(Configuring extensions) + +dnl +dnl Check if all enabled by default extensions should be disabled +dnl + +AC_ARG_ENABLE(all, +[ --disable-all Disable all extensions enabled by default. + --enable-all Enable all extensions. +], [ + PHP_ENABLE_ALL=$enableval +]) # reading config stubs esyscmd(./scripts/config-stubs ext) Index: php4/ext/curl/config.m4 diff -u php4/ext/curl/config.m4:1.15 php4/ext/curl/config.m4:1.16 --- php4/ext/curl/config.m4:1.15 Sun Aug 25 08:24:40 2002 +++ php4/ext/curl/config.m4 Wed Sep 4 14:47:22 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.15 2002/08/25 12:24:40 derick Exp $ +dnl $Id: config.m4,v 1.16 2002/09/04 18:47:22 sniper Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -7,7 +7,7 @@ dnl Temporary option while we develop this aspect of the extension PHP_ARG_WITH(curlwrappers, if we should use CURL for url streams, -[ --with-curlwrappers Use CURL for url streams]) +[ --with-curlwrappers Use CURL for url streams], no, no) if test "$PHP_CURL" != "no"; then if test -r $PHP_CURL/include/curl/easy.h; then Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.40 php4/ext/domxml/config.m4:1.41 --- php4/ext/domxml/config.m4:1.40 Thu Aug 22 11:02:41 2002 +++ php4/ext/domxml/config.m4 Wed Sep 4 14:47:22 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.40 2002/08/22 15:02:41 chregu Exp $ +dnl $Id: config.m4,v 1.41 2002/09/04 18:47:22 sniper Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -108,12 +108,12 @@ ]) PHP_ARG_WITH(dom-xslt, for DOM XSLT support, -[ --with-dom-xslt[=DIR] Include DOM XSLT support (requires libxslt >= 1.0.18). - DIR is the libxslt install directory.]) +[ --with-dom-xslt[=DIR] DOMXML: Include DOM XSLT support (requires libxslt >= 1.0.18). + DIR is the libxslt install directory.], no, no) PHP_ARG_WITH(dom-exslt, for DOM EXSLT support, -[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.18). - DIR is the libexslt install directory.]) +[ --with-dom-exslt[=DIR] DOMXML: Include DOM EXSLT support (requires libxslt >= 1.0.18). + DIR is the libexslt install directory.], no, no) if test "$PHP_DOM_XSLT" != "no"; then Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.107 php4/ext/gd/config.m4:1.108 --- php4/ext/gd/config.m4:1.107 Thu Aug 29 22:44:45 2002 +++ php4/ext/gd/config.m4 Wed Sep 4 14:47:22 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.107 2002/08/30 02:44:45 sniper Exp $ +dnl $Id: config.m4,v 1.108 2002/09/04 18:47:22 sniper Exp $ dnl dnl @@ -10,25 +10,25 @@ [ --with-gd[=DIR] Include GD support (DIR is GD's install dir).]) PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, -[ --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix.]) +[ --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix.], no, no) PHP_ARG_WITH(png-dir, for the location of libpng, -[ --with-png-dir=DIR GD: Set the path to libpng install prefix.]) +[ --with-png-dir=DIR GD: Set the path to libpng install prefix.], no, no) PHP_ARG_WITH(xpm-dir, for the location of libXpm, -[ --with-xpm-dir=DIR GD: Set the path to libXpm install prefix.]) +[ --with-xpm-dir=DIR GD: Set the path to libXpm install prefix.], no, no) PHP_ARG_WITH(ttf, for FreeType 1.x support, -[ --with-ttf[=DIR] GD: Include FreeType 1.x support]) +[ --with-ttf[=DIR] GD: Include FreeType 1.x support], no, no) PHP_ARG_WITH(freetype-dir, for FreeType 2, -[ --with-freetype-dir=DIR GD: Set the path to FreeType 2 install prefix.]) +[ --with-freetype-dir=DIR GD: Set the path to FreeType 2 install prefix.], no, no) PHP_ARG_WITH(t1lib, for T1lib support, -[ --with-t1lib[=DIR] GD: Include T1lib support.]) +[ --with-t1lib[=DIR] GD: Include T1lib support.], no, no) PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD, -[ --enable-gd-native-ttf GD: Enable TrueType string function.]) +[ --enable-gd-native-ttf GD: Enable TrueType string function.], no, no) dnl dnl Checks for the configure options Index: php4/ext/mbstring/config.m4 diff -u php4/ext/mbstring/config.m4:1.23 php4/ext/mbstring/config.m4:1.24 --- php4/ext/mbstring/config.m4:1.23 Tue Sep 3 01:18:20 2002 +++ php4/ext/mbstring/config.m4 Wed Sep 4 14:47:23 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.23 2002/09/03 05:18:20 hirokawa Exp $ +dnl $Id: config.m4,v 1.24 2002/09/04 18:47:23 sniper Exp $ dnl PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support, @@ -35,11 +35,8 @@ PHP_ARG_ENABLE(mbregex, whether to enable multibyte regex support, -[ --disable-mbregex Disable multibyte regex support], yes) +[ --disable-mbregex Disable multibyte regex support], yes, no) if test "$MBREGEX" != "no" ; then AC_DEFINE(HAVE_MBREGEX, 1, [whether to have multibyte regex support]) fi - - - Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.52 php4/ext/mysql/config.m4:1.53 --- php4/ext/mysql/config.m4:1.52 Mon Jul 8 11:31:01 2002 +++ php4/ext/mysql/config.m4 Wed Sep 4 14:47:23 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.52 2002/07/08 15:31:01 sniper Exp $ +dnl $Id: config.m4,v 1.53 2002/09/04 18:47:23 sniper Exp $ dnl sinclude(ext/mysql/libmysql/acinclude.m4) @@ -43,13 +43,13 @@ ]) -PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, -[ --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer. - If unspecified, the default locations are searched.]) - PHP_ARG_WITH(mysql, for MySQL support, [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. If unspecified, the bundled MySQL library will be used.], yes) + +PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, +[ --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer. + If unspecified, the default locations are searched.], no, no) if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.32 php4/ext/pdf/config.m4:1.33 --- php4/ext/pdf/config.m4:1.32 Sun Aug 18 01:13:03 2002 +++ php4/ext/pdf/config.m4 Wed Sep 4 14:47:23 2002 @@ -1,27 +1,25 @@ dnl -dnl $Id: config.m4,v 1.32 2002/08/18 05:13:03 avsm Exp $ +dnl $Id: config.m4,v 1.33 2002/09/04 18:47:23 sniper Exp $ dnl PHP_ARG_WITH(pdflib,for PDFlib support, [ --with-pdflib[=DIR] Include PDFlib support.]) -pdflib_ext_shared=$ext_shared - PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. - (OPTIONAL for PDFlib v4)]) + (OPTIONAL for PDFlib v4)], no, no) PHP_ARG_WITH(png-dir, for the location of libpng, [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. - (OPTIONAL for PDFlib v4)]) + (OPTIONAL for PDFlib v4)], no, no) PHP_ARG_WITH(tiff-dir, for the location of libtiff, [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. - (OPTIONAL for PDFlib v4)]) + (OPTIONAL for PDFlib v4)], no, no) if test "$PHP_PDFLIB" != "no"; then - PHP_NEW_EXTENSION(pdf, pdf.c, $pdflib_ext_shared) + PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared) PHP_SUBST(PDFLIB_SHARED_LIBADD) dnl # Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.20 php4/ext/session/config.m4:1.21 --- php4/ext/session/config.m4:1.20 Wed Sep 4 09:52:41 2002 +++ php4/ext/session/config.m4 Wed Sep 4 14:47:24 2002 @@ -1,12 +1,12 @@ dnl -dnl $Id: config.m4,v 1.20 2002/09/04 13:52:41 kalowsky Exp $ +dnl $Id: config.m4,v 1.21 2002/09/04 18:47:24 sniper Exp $ dnl -PHP_ARG_WITH(mm,for mm support, -[ --with-mm[=DIR] Include mm support for session storage]) - PHP_ARG_ENABLE(session, whether to enable PHP sessions, [ --disable-session Disable session support], yes) + +PHP_ARG_WITH(mm,for mm support, +[ --with-mm[=DIR] Include mm support for session storage], no, no) if test "$PHP_SESSION" != "no"; then PHP_NEW_EXTENSION(session, session.c mod_files.c mod_mm.c mod_user.c, $ext_shared) Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.36 php4/ext/xml/config.m4:1.37 --- php4/ext/xml/config.m4:1.36 Sat May 4 12:48:01 2002 +++ php4/ext/xml/config.m4 Wed Sep 4 14:47:24 2002 @@ -1,10 +1,7 @@ dnl -dnl $Id: config.m4,v 1.36 2002/05/04 16:48:01 sas Exp $ +dnl $Id: config.m4,v 1.37 2002/09/04 18:47:24 sniper Exp $ dnl -dnl Fallback for --with-xml[=DIR] -dnl PHP_ARG_WITH(xml,[],enable_xml=$withval) - AC_C_BIGENDIAN if test "$ac_cv_c_bigendian" = "yes"; then @@ -13,36 +10,35 @@ order=12 fi -PHP_ARG_WITH(expat-dir, external libexpat install dir, -[ --with-expat-dir=DIR XML: external libexpat install dir]) - PHP_ARG_ENABLE(xml,whether to enable XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) +PHP_ARG_WITH(expat-dir, external libexpat install dir, +[ --with-expat-dir=DIR XML: external libexpat install dir], no, no) + if test "$PHP_XML" = "yes"; then AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) -if test "$PHP_EXPAT_DIR" = "no"; then + if test "$PHP_EXPAT_DIR" = "no"; then AC_DEFINE(HAVE_LIBEXPAT_BUNDLED, 1, [ ]) PHP_NEW_EXTENSION(xml, xml.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c, $ext_shared,,-DXML_BYTE_ORDER=$order) PHP_ADD_INCLUDE($ext_srcdir/expat) PHP_ADD_BUILD_DIR($ext_builddir/expat) -else - - PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + else + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + + for i in $PHP_XML $PHP_EXPAT_DIR; do + if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then + EXPAT_DIR=$i + fi + done - for i in $PHP_XML $PHP_EXPAT_DIR; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then - EXPAT_DIR=$i + if test -z "$EXPAT_DIR"; then + AC_MSG_ERROR(not found. Please reinstall the expat distribution.) fi - done - if test -z "$EXPAT_DIR"; then - AC_MSG_ERROR(not found. Please reinstall the expat distribution.) + PHP_ADD_INCLUDE($EXPAT_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) + PHP_SUBST(EXPAT_SHARED_LIBADD) fi - - PHP_ADD_INCLUDE($EXPAT_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) - PHP_SUBST(EXPAT_SHARED_LIBADD) -fi fi Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.17 php4/ext/xmlrpc/config.m4:1.18 --- php4/ext/xmlrpc/config.m4:1.17 Thu Aug 29 22:57:11 2002 +++ php4/ext/xmlrpc/config.m4 Wed Sep 4 14:47:25 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2002/08/30 02:57:11 sniper Exp $ +dnl $Id: config.m4,v 1.18 2002/09/04 18:47:25 sniper Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -10,13 +10,11 @@ PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support, [ --with-xmlrpc[=DIR] Include XMLRPC-EPI support.]) -xmlrpc_ext_shared=$ext_shared - PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI, -[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.]) +[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.],yes,no) PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI, -[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI.]) +[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI.],yes,no) if test "$PHP_XMLRPC" != "no"; then @@ -58,7 +56,7 @@ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ - libxmlrpc/xml_to_soap.c,$xmlrpc_ext_shared,, + libxmlrpc/xml_to_soap.c,$ext_shared,, -I@ext_srcdir@/libxmlrpc -DVERSION="0.50") PHP_ADD_BUILD_DIR($ext_builddir/libxmlrpc) XMLRPC_MODULE_TYPE=builtin Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.26 php4/ext/xslt/config.m4:1.27 --- php4/ext/xslt/config.m4:1.26 Thu Aug 29 23:52:40 2002 +++ php4/ext/xslt/config.m4 Wed Sep 4 14:47:25 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.26 2002/08/30 03:52:40 sniper Exp $ +dnl $Id: config.m4,v 1.27 2002/09/04 18:47:25 sniper Exp $ dnl dnl +------------------------------------------------------------------------------+ dnl | This is where the magic of the extension reallly is. Depending on what | @@ -9,31 +9,22 @@ 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.]) +[ --with-xslt-sablot=DIR XSLT: Enable the sablotron backend.], no, no) PHP_ARG_WITH(expat-dir, for libexpat dir for Sablotron XSL support, -[ --with-expat-dir=DIR XSLT: libexpat dir for Sablotron.]) +[ --with-expat-dir=DIR XSLT: libexpat dir for Sablotron.], no, no) PHP_ARG_WITH(iconv-dir, for iconv dir for Sablotron XSL support, -[ --with-iconv-dir=DIR XSLT: iconv dir for Sablotron.]) +[ --with-iconv-dir=DIR XSLT: iconv dir for Sablotron.], no, no) + +PHP_ARG_WITH(sablot-js, for JavaScript for Sablotron XSL support, +[ --with-sablot-js=DIR XSLT: enable JavaScript support for Sablotron.], no, no) -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, $xslt_ext_shared) + PHP_NEW_EXTENSION(xslt, xslt.c sablot.c, $ext_shared) PHP_SUBST(XSLT_SHARED_LIBADD) if test "$PHP_XSLT_SABLOT" != "no"; then Index: php4/ext/zlib/config0.m4 diff -u php4/ext/zlib/config0.m4:1.7 php4/ext/zlib/config0.m4:1.8 --- php4/ext/zlib/config0.m4:1.7 Tue Mar 12 12:50:12 2002 +++ php4/ext/zlib/config0.m4 Wed Sep 4 14:47:25 2002 @@ -1,12 +1,12 @@ dnl -dnl $Id: config0.m4,v 1.7 2002/03/12 17:50:12 sas Exp $ +dnl $Id: config0.m4,v 1.8 2002/09/04 18:47:25 sniper Exp $ dnl -PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, -[ --with-zlib-dir=<DIR> Define the location of zlib install directory]) - PHP_ARG_WITH(zlib,for ZLIB support, [ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.0.9).]) + +PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, +[ --with-zlib-dir=<DIR> Define the location of zlib install directory], no, no) if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c, $ext_shared) Index: php4/sapi/cgi/config.m4 diff -u php4/sapi/cgi/config.m4:1.17 php4/sapi/cgi/config.m4:1.18 --- php4/sapi/cgi/config.m4:1.17 Tue Aug 6 13:51:24 2002 +++ php4/sapi/cgi/config.m4 Wed Sep 4 14:47:26 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2002/08/06 17:51:24 markonen Exp $ +dnl $Id: config.m4,v 1.18 2002/09/04 18:47:26 sniper Exp $ dnl AC_DEFUN(PHP_TEST_WRITE_STDOUT,[ @@ -39,7 +39,7 @@ [ --enable-force-cgi-redirect Enable the security check for internal server redirects. You should use this if you are - running the CGI version with Apache. ]) + running the CGI version with Apache. ], no, no) if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then REDIRECT=1 @@ -52,7 +52,7 @@ [ --enable-discard-path If this is enabled, the PHP CGI binary can safely be placed outside of the web tree and people will not be able - to circumvent .htaccess security. ]) + to circumvent .htaccess security. ], no, no) if test "$PHP_DISCARD_PATH" = "yes"; then DISCARD_PATH=1 Index: php4/sapi/pi3web/config.m4 diff -u php4/sapi/pi3web/config.m4:1.6 php4/sapi/pi3web/config.m4:1.7 --- php4/sapi/pi3web/config.m4:1.6 Thu Mar 7 09:19:54 2002 +++ php4/sapi/pi3web/config.m4 Wed Sep 4 14:47:26 2002 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.6 2002/03/07 14:19:54 sas Exp $ +dnl $Id: config.m4,v 1.7 2002/09/04 18:47:26 sniper Exp $ dnl PHP_ARG_WITH(pi3web,for Pi3Web Support, -[ --with-pi3web=DIR Build PHP as a module for use with Pi3Web.]) +[ --with-pi3web=DIR Build PHP as a module for use with Pi3Web.], no, no) if test "$PHP_PI3WEB" != "no"; then if test "$PHP_PI3WEB" = "yes"; then