cvs: php4(PHP_4_0_6) /ext/ldap config.m4 /ext/mbstring config.m4 /ext/mcrypt config.m4 /ext/ming config.m4 /ext/mnogosearch config.m4 /ext/oci8
config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /ext/saprfc config.m4 /ext/zlib zlib.m4 /sapi/caudium config.m4 /sapi/isapi config.m4

sas Sat May 12 02:29:09 2001 EDT Modified files: (Branch: PHP_4_0_6) /php4/ext/ldap config.m4 /php4/ext/mbstring config.m4 /php4/ext/mcrypt config.m4 /php4/ext/ming config.m4 /php4/ext/mnogosearch config.m4 /php4/ext/oci8 config.m4 /php4/ext/odbc config.m4 /php4/ext/oracle config.m4 /php4/ext/saprfc config.m4 /php4/ext/zlib zlib.m4 /php4/sapi/caudium config.m4 /php4/sapi/isapi config.m4 Log: MFH indentation patch

Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.16 php4/ext/ldap/config.m4:1.16.2.1 --- php4/ext/ldap/config.m4:1.16 Tue Mar 27 12:34:30 2001 +++ php4/ext/ldap/config.m4 Sat May 12 02:29:06 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.16 2001/03/27 20:34:30 sniper Exp $ +dnl $Id: config.m4,v 1.16.2.1 2001/05/12 09:29:06 sas Exp $ AC_DEFUN(PHP_LDAP_CHECKS, [ if test -f $1/include/ldap.h; then @@ -17,7 +17,8 @@ ]) PHP_ARG_WITH(ldap,whether to include LDAP support, -[ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base install directory.]) +[ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base + install directory.]) if test "$PHP_LDAP" != "no"; then Index: php4/ext/mbstring/config.m4 diff -u php4/ext/mbstring/config.m4:1.1 php4/ext/mbstring/config.m4:1.1.2.1 --- php4/ext/mbstring/config.m4:1.1 Mon Apr 30 18:48:50 2001 +++ php4/ext/mbstring/config.m4 Sat May 12 02:29:06 2001 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.1 2001/05/01 01:48:50 hirokawa Exp $ +dnl $Id: config.m4,v 1.1.2.1 2001/05/12 09:29:06 sas Exp $ dnl config.m4 for extension mbstring PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support, -[ --enable-mbstring Enable multibyte string support]) +[ --enable-mbstring Enable multibyte string support]) if test "$PHP_MBSTRING" != "no"; then AC_DEFINE(HAVE_MBSTRING,1,[ ]) Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.17 php4/ext/mcrypt/config.m4:1.17.2.1 --- php4/ext/mcrypt/config.m4:1.17 Wed May 9 17:55:16 2001 +++ php4/ext/mcrypt/config.m4 Sat May 12 02:29:06 2001 @@ -1,9 +1,10 @@ dnl -dnl $Id: config.m4,v 1.17 2001/05/10 00:55:16 sniper Exp $ +dnl $Id: config.m4,v 1.17.2.1 2001/05/12 09:29:06 sas Exp $ dnl PHP_ARG_WITH(mcrypt, for mcrypt support, -[ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt install directory.]) +[ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt install + directory.]) if test "$PHP_MCRYPT" != "no"; then for i in /usr/local /usr $PHP_MCRYPT; do Index: php4/ext/ming/config.m4 diff -u php4/ext/ming/config.m4:1.5 php4/ext/ming/config.m4:1.5.2.1 --- php4/ext/ming/config.m4:1.5 Tue Mar 27 12:34:32 2001 +++ php4/ext/ming/config.m4 Sat May 12 02:29:06 2001 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.5 2001/03/27 20:34:32 sniper Exp $ +dnl $Id: config.m4,v 1.5.2.1 2001/05/12 09:29:06 sas Exp $ dnl config.m4 for extension libming PHP_ARG_WITH(ming, whether to include ming support, -[ --with-ming[=DIR] Include ming support]) +[ --with-ming[=DIR] Include ming support]) if test "$PHP_MING" != "no"; then for i in $PHP_MING /usr/local /usr; do Index: php4/ext/mnogosearch/config.m4 diff -u php4/ext/mnogosearch/config.m4:1.7 php4/ext/mnogosearch/config.m4:1.7.2.1 --- php4/ext/mnogosearch/config.m4:1.7 Tue Mar 27 12:34:33 2001 +++ php4/ext/mnogosearch/config.m4 Sat May 12 02:29:06 2001 @@ -1,9 +1,11 @@ dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $ -dnl $Id: config.m4,v 1.7 2001/03/27 20:34:33 sniper Exp $ +dnl $Id: config.m4,v 1.7.2.1 2001/05/12 09:29:06 sas Exp $ PHP_ARG_WITH(mnogosearch,for mnoGoSearch support, -[ --with-mnogosearch[=DIR] Include mnoGoSearch support. DIR is the mnoGoSearch base - install directory, defaults to /usr/local/mnogosearch.]) +[ --with-mnogosearch[=DIR] + Include mnoGoSearch support. DIR is the mnoGoSearch + base install directory, defaults to + /usr/local/mnogosearch.]) if test "$PHP_MNOGOSEARCH" != "no"; then Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.27 php4/ext/oci8/config.m4:1.27.2.1 --- php4/ext/oci8/config.m4:1.27 Sat Apr 14 02:51:29 2001 +++ php4/ext/oci8/config.m4 Sat May 12 02:29:07 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2001/04/14 09:51:29 thies Exp $ +dnl $Id: config.m4,v 1.27.2.1 2001/05/12 09:29:07 sas Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -22,7 +22,8 @@ ]) PHP_ARG_WITH(oci8, for Oracle-OCI8 support, -[ --with-oci8[=DIR] Include Oracle-oci8 support. Default DIR is ORACLE_HOME.]) +[ --with-oci8[=DIR] Include Oracle-oci8 support. Default DIR is + ORACLE_HOME.]) if test "$PHP_OCI8" != "no"; then AC_MSG_CHECKING([Oracle Install-Dir]) Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.41 php4/ext/odbc/config.m4:1.41.2.1 --- php4/ext/odbc/config.m4:1.41 Wed May 9 08:35:31 2001 +++ php4/ext/odbc/config.m4 Sat May 12 02:29:07 2001 @@ -210,9 +210,9 @@ AC_MSG_CHECKING(for Empress support) AC_ARG_WITH(empress, [ --with-empress[=DIR] Include Empress support. DIR is the Empress base - install directory, defaults to \$EMPRESSPATH. - From PHP4, this option only supports Empress Version - 8.60 and above], + install directory, defaults to \$EMPRESSPATH. + From PHP4, this option only supports Empress Version + 8.60 and above], [ PHP_WITH_SHARED if test "$withval" != "no"; then @@ -240,10 +240,11 @@ if test -z "$ODBC_TYPE"; then AC_MSG_CHECKING(for Empress local access support) AC_ARG_WITH(empress-bcs, -[ --with-empress-bcs[=DIR]Include Empress Local Access support. DIR is the - Empress base install directory, defaults to \$EMPRESSPATH. - From PHP4, this option only supports Empress Version - 8.60 and above], +[ --with-empress-bcs[=DIR] + Include Empress Local Access support. DIR is the + Empress base install directory, defaults to + \$EMPRESSPATH. From PHP4, this option only supports + Empress Version 8.60 and above.], [ PHP_WITH_SHARED if test "$withval" != "no"; then Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.22 php4/ext/oracle/config.m4:1.22.2.1 --- php4/ext/oracle/config.m4:1.22 Thu May 10 02:25:30 2001 +++ php4/ext/oracle/config.m4 Sat May 12 02:29:07 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.22 2001/05/10 09:25:30 sniper Exp $ +dnl $Id: config.m4,v 1.22.2.1 2001/05/12 09:29:07 sas Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -22,7 +22,8 @@ ]) PHP_ARG_WITH(oracle, for Oracle-ORACLE support, -[ --with-oracle[=DIR] Include Oracle-oci7 support. Default DIR is ORACLE_HOME.]) +[ --with-oracle[=DIR] Include Oracle-oci7 support. Default DIR is + ORACLE_HOME.]) if test "$PHP_ORACLE" != "no"; then AC_MSG_CHECKING([Oracle Install-Dir]) Index: php4/ext/saprfc/config.m4 diff -u php4/ext/saprfc/config.m4:1.3 php4/ext/saprfc/config.m4:1.3.2.1 --- php4/ext/saprfc/config.m4:1.3 Wed May 9 06:48:59 2001 +++ php4/ext/saprfc/config.m4 Sat May 12 02:29:07 2001 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.3 2001/05/09 13:48:59 sas Exp $ +dnl $Id: config.m4,v 1.3.2.1 2001/05/12 09:29:07 sas Exp $ dnl config.m4 for extension saprfc PHP_ARG_WITH(saprfc, for saprfc support, -[ --with-saprfc Include saprfc support]) +[ --with-saprfc[=DIR] Include saprfc support]) if test "$PHP_SAPRFC" != "no"; then # --with-saprfc -> check with-path Index: php4/ext/zlib/zlib.m4 diff -u php4/ext/zlib/zlib.m4:1.1 php4/ext/zlib/zlib.m4:1.1.2.1 --- php4/ext/zlib/zlib.m4:1.1 Wed May 9 17:57:36 2001 +++ php4/ext/zlib/zlib.m4 Sat May 12 02:29:08 2001 @@ -1,9 +1,9 @@ dnl -dnl $Id: zlib.m4,v 1.1 2001/05/10 00:57:36 sniper Exp $ +dnl $Id: zlib.m4,v 1.1.2.1 2001/05/12 09:29:08 sas 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]) +[ --with-zlib-dir[=DIR] Define the location of zlib install directory]) PHP_ARG_WITH(zlib,whether to include ZLIB support, [ --with-zlib[=DIR] Include zlib support (requires zlib >= 1.0.9). Index: php4/sapi/caudium/config.m4 diff -u php4/sapi/caudium/config.m4:1.7 php4/sapi/caudium/config.m4:1.7.2.1 --- php4/sapi/caudium/config.m4:1.7 Tue Mar 27 12:34:45 2001 +++ php4/sapi/caudium/config.m4 Sat May 12 02:29:08 2001 @@ -1,11 +1,11 @@ -dnl ## $Id: config.m4,v 1.7 2001/03/27 20:34:45 sniper Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.7.2.1 2001/05/12 09:29:08 sas Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for Caudium support) AC_ARG_WITH(caudium, [ --with-caudium=DIR Build PHP as a Pike module for use with Caudium DIR is the Caudium server dir, with the default value - /usr/local/caudium/server.], + /usr/local/caudium/server.], [ if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi if test ! -d $withval ; then Index: php4/sapi/isapi/config.m4 diff -u php4/sapi/isapi/config.m4:1.11 php4/sapi/isapi/config.m4:1.11.2.1 --- php4/sapi/isapi/config.m4:1.11 Tue Apr 3 13:59:47 2001 +++ php4/sapi/isapi/config.m4 Sat May 12 02:29:09 2001 @@ -1,9 +1,9 @@ -dnl ## $Id: config.m4,v 1.11 2001/04/03 20:59:47 wsanchez Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.11.2.1 2001/05/12 09:29:09 sas Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for Zeus ISAPI support) AC_ARG_WITH(isapi, -[ --with-isapi=DIR Build PHP as an ISAPI module for use with Zeus.], +[ --with-isapi=DIR Build PHP as an ISAPI module for use with Zeus.], [ if test "$withval" = "yes"; then ZEUSPATH=/usr/local/zeus # the default