Fix long-standing visual pain point: the misalignment of './configure help' text.

Whitespace changes and a couple of grammar fixes.

48 files changed, 103 insertions, 102 deletions

diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 3e6aa78d05..55917c07f4 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(bz2, for BZip2 support,
-[  --with-bz2[=DIR]        Include BZip2 support])
+[  --with-bz2[=DIR]          Include BZip2 support])
 
 if test "$PHP_BZ2" != "no"; then
   if test -r $PHP_BZ2/include/bzlib.h; then
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index e3d1d51ccc..2f82c3485d 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(curl, for cURL support,
-[  --with-curl[=DIR]       Include cURL support])
+[  --with-curl[=DIR]         Include cURL support])
 
 if test "$PHP_CURL" != "no"; then
   if test -r $PHP_CURL/include/curl/easy.h; then
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 4b123518b4..5442bb1415 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -557,10 +557,10 @@ PHP_ARG_WITH(cdb,,
 [  --without-cdb[=DIR]       DBA: CDB support (bundled)], $php_dba_enable, no)
 
 PHP_ARG_ENABLE(inifile,,
-[  --disable-inifile         DBA: INI support (bundled)], $php_dba_enable, no)
+[  --disable-inifile       DBA: INI support (bundled)], $php_dba_enable, no)
 
 PHP_ARG_ENABLE(flatfile,,
-[  --disable-flatfile        DBA: FlatFile support (bundled)], $php_dba_enable, no)
+[  --disable-flatfile      DBA: FlatFile support (bundled)], $php_dba_enable, no)
 
 # CDB
 if test "$PHP_CDB" = "yes"; then
diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4
index cc40d0bd03..db8a69c5d1 100755
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(enchant,for ENCHANT support,
-[  --with-enchant[=DIR]     Include enchant support.
+[  --with-enchant[=DIR]      Include enchant support.
                           GNU Aspell version 1.1.3 or higher required.])
 
 if test "$PHP_ENCHANT" != "no"; then
diff --git a/ext/ereg/config0.m4 b/ext/ereg/config0.m4
index f4f8190932..caec39d285 100644
--- a/ext/ereg/config0.m4
+++ b/ext/ereg/config0.m4
@@ -5,7 +5,7 @@ dnl
 dnl Check for regex library type
 dnl
 PHP_ARG_WITH(regex,,
-[  --with-regex=TYPE       regex library type: system, php. [TYPE=php]
+[  --with-regex=TYPE       Regex library type: system, php. [TYPE=php]
                           WARNING: Do NOT use unless you know what you are doing!], php, no)
 
 case $PHP_REGEX in
diff --git a/ext/filter/config.m4 b/ext/filter/config.m4
index b4e32a21a4..676f5d99ef 100644
--- a/ext/filter/config.m4
+++ b/ext/filter/config.m4
@@ -5,7 +5,7 @@ PHP_ARG_ENABLE(filter, whether to enable input filter support,
 [  --disable-filter        Disable input filter support], yes)
 
 PHP_ARG_WITH(pcre-dir, pcre install prefix,
-[  --with-pcre-dir           FILTER: pcre install prefix], no, no)
+[  --with-pcre-dir         FILTER: pcre install prefix], no, no)
 
 if test "$PHP_FILTER" != "no"; then
 
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 50660af6cd..c9e080faab 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -7,11 +7,11 @@ dnl Configure options
 dnl
 
 PHP_ARG_WITH(gd, for GD support,
-[  --with-gd[=DIR]         Include GD support.  DIR is the GD library base
+[  --with-gd[=DIR]           Include GD support.  DIR is the GD library base
                           install directory [BUNDLED]])
 if test -z "$PHP_VPX_DIR"; then
   PHP_ARG_WITH(vpx-dir, for the location of libvpx,
-  [  --with-vpx-dir[=DIR]     GD: Set the path to libvpx install prefix], no, no)
+  [  --with-vpx-dir[=DIR]      GD: Set the path to libvpx install prefix], no, no)
 fi
 
 if test -z "$PHP_JPEG_DIR"; then
@@ -39,10 +39,10 @@ PHP_ARG_WITH(t1lib, for T1lib support,
 [  --with-t1lib[=DIR]        GD: Include T1lib support. T1lib version >= 5.0.0 required], 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], no, no)
+[  --enable-gd-native-ttf  GD: Enable TrueType string function], no, no)
 
 PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
-[  --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support], no, no)
+[  --enable-gd-jis-conv    GD: Enable JIS-mapped Japanese font support], no, no)
 
 dnl
 dnl Checks for the configure options
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 02d436c6e7..24dddd3a43 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(gettext,for GNU gettext support,
-[  --with-gettext[=DIR]    Include GNU gettext support])
+[  --with-gettext[=DIR]      Include GNU gettext support])
 
 if test "$PHP_GETTEXT" != "no"; then
   for i in $PHP_GETTEXT /usr/local /usr; do
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index 9606b2f56d..2140aaf701 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(gmp, for GNU MP support,
-[  --with-gmp[=DIR]        Include GNU MP support])
+[  --with-gmp[=DIR]          Include GNU MP support])
 
 if test "$PHP_GMP" != "no"; then
 
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 79ac25e19f..44c6d267bc 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension hash
 
 PHP_ARG_WITH(mhash, for mhash support,
-[  --with-mhash[=DIR]      Include mhash support])
+[  --with-mhash[=DIR]        Include mhash support])
 
 PHP_ARG_ENABLE(hash, whether to enable hash support,
 [  --disable-hash          Disable hash support], yes)
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index d673b0adba..10d21ccc6d 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(iconv, for iconv support,
-[  --without-iconv[=DIR]   Exclude iconv support], yes)
+[  --without-iconv[=DIR]     Exclude iconv support], yes)
 
 if test "$PHP_ICONV" != "no"; then
 
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 3ad7c107dd..3efc245901 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -95,7 +95,7 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [
 
 
 PHP_ARG_WITH(imap,for IMAP support,
-[  --with-imap[=DIR]       Include IMAP support. DIR is the c-client install prefix])
+[  --with-imap[=DIR]         Include IMAP support. DIR is the c-client install prefix])
 
 PHP_ARG_WITH(kerberos,for IMAP Kerberos support,
 [  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install prefix], no, no)
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 603145ad6c..dfd850b00a 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(interbase,for InterBase support,
-[  --with-interbase[=DIR]  Include InterBase support.  DIR is the InterBase base
+[  --with-interbase[=DIR]    Include InterBase support.  DIR is the InterBase base
                           install directory [/usr/interbase]])
 
 if test "$PHP_INTERBASE" != "no"; then
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 58d994c10e..3c8e23ea8e 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -63,7 +63,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [
 ])
 
 PHP_ARG_WITH(ldap,for LDAP support,
-[  --with-ldap[=DIR]       Include LDAP support])
+[  --with-ldap[=DIR]         Include LDAP support])
 
 PHP_ARG_WITH(ldap-sasl,for LDAP Cyrus SASL support,
 [  --with-ldap-sasl[=DIR]    LDAP: Include Cyrus SASL support], no, no)
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 5d70d45b80..25bf238761 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -344,19 +344,19 @@ PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support,
 [  --enable-mbstring       Enable multibyte string support])
 
 PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support],
-[  --disable-mbregex         MBSTRING: Disable multibyte regex support], yes, no)
+[  --disable-mbregex       MBSTRING: Disable multibyte regex support], yes, no)
 
 PHP_ARG_ENABLE([mbregex_backtrack], [whether to check multibyte regex backtrack],
 [  --disable-mbregex-backtrack
-                            MBSTRING: Disable multibyte regex backtrack check], yes, no)
+                          MBSTRING: Disable multibyte regex backtrack check], yes, no)
 
 PHP_ARG_WITH(libmbfl, [for external libmbfl],
 [  --with-libmbfl[=DIR]      MBSTRING: Use external libmbfl.  DIR is the libmbfl base
-                            install directory [BUNDLED]], no, no)
+                          install directory [BUNDLED]], no, no)
 
 PHP_ARG_WITH(onig, [for external oniguruma],
 [  --with-onig[=DIR]         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
-                            If DIR is not set, the bundled oniguruma will be used], no, no)
+                          If DIR is not set, the bundled oniguruma will be used], no, no)
 
 if test "$PHP_MBSTRING" != "no"; then  
   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index cc68d8627b..ab954e649e 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -21,7 +21,7 @@ AC_DEFUN([PHP_MCRYPT_CHECK_VERSION],[
 
 
 PHP_ARG_WITH(mcrypt, for mcrypt support,
-[  --with-mcrypt[=DIR]     Include mcrypt support])
+[  --with-mcrypt[=DIR]       Include mcrypt support])
 
 if test "$PHP_MCRYPT" != "no"; then
   for i in $PHP_MCRYPT /usr/local /usr; do
diff --git a/ext/mssql/config.m4 b/ext/mssql/config.m4
index 4231bb360a..2a298af734 100644
--- a/ext/mssql/config.m4
+++ b/ext/mssql/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS,
-[  --with-mssql[=DIR]      Include MSSQL-DB support.  DIR is the FreeTDS home
+[  --with-mssql[=DIR]        Include MSSQL-DB support.  DIR is the FreeTDS home
                           directory [/usr/local/freetds]])
 
 if test "$PHP_MSSQL" != "no"; then
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 998323d7c4..fd7f52ef3a 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -40,13 +40,14 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
 
 
 PHP_ARG_WITH(mysql, for MySQL support,
-[  --with-mysql[=DIR]      Include MySQL support.  DIR is the MySQL base
+[  --with-mysql[=DIR]        Include MySQL support.  DIR is the MySQL base
                           directory, if no DIR is passed or the value is
                           mysqlnd the MySQL native driver will be used])
 
 PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
-[  --with-mysql-sock[=SOCKPATH]   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
-                            If unspecified, the default locations are searched], no, no)
+[  --with-mysql-sock[=SOCKPATH]
+                          MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
+                          If unspecified, the default locations are searched], no, no)
 
 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz, 
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 687b422898..f6c86e762b 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -3,13 +3,14 @@ dnl $Id$
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
-[  --with-mysqli[=FILE]    Include MySQLi support.  FILE is the path
+[  --with-mysqli[=FILE]      Include MySQLi support.  FILE is the path
                           to mysql_config.  If no value or mysqlnd is passed 
                           as FILE, the MySQL native driver will be used])
 
 PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
-[  --enable-embedded-mysqli  MYSQLi: Enable embedded support
-                            Note: Does not work with MySQL native driver!], no, no)
+[  --enable-embedded-mysqli  
+                          MYSQLi: Enable embedded support
+                          Note: Does not work with MySQL native driver!], no, no)
 
 if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
   dnl This needs to be set in any extension which wishes to use mysqlnd
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 3fc767b231..09aca5af8a 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -8,11 +8,11 @@ PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
 
 PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-                            Disable support for the MySQL compressed protocol in mysqlnd], yes, no)
+                          Disable support for the MySQL compressed protocol in mysqlnd], yes, no)
 
 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,
-  [  --with-zlib-dir[=DIR]       mysqlnd: Set the path to libz install prefix], no, no)
+  [  --with-zlib-dir[=DIR]     mysqlnd: Set the path to libz install prefix], no, no)
 fi
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 34ae76c44b..39c037548a 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -103,7 +103,7 @@ dnl --with-oci8=shared,instantclient,/path/to/client/dir/lib
 dnl or
 dnl --with-oci8=shared,/path/to/oracle/home
 PHP_ARG_WITH(oci8, for Oracle Database OCI8 support,
-[  --with-oci8[=DIR]       Include Oracle Database OCI8 support. DIR defaults to \$ORACLE_HOME.
+[  --with-oci8[=DIR]         Include Oracle Database OCI8 support. DIR defaults to \$ORACLE_HOME.
                           Use --with-oci8=instantclient,/path/to/instant/client/lib 
                           to use an Oracle Instant Client installation])
 
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 5be3288f30..14ec97bf36 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -101,7 +101,7 @@ dnl configure options
 dnl
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(adabas,,
-[  --with-adabas[=DIR]     Include Adabas D support [/usr/local]])
+[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
 
   if test "$PHP_ADABAS" != "no"; then
     AC_MSG_CHECKING([for Adabas support])
@@ -128,7 +128,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(sapdb,,
-[  --with-sapdb[=DIR]      Include SAP DB support [/usr/local]])
+[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]])
 
   if test "$PHP_SAPDB" != "no"; then
     AC_MSG_CHECKING([for SAP DB support])
@@ -146,7 +146,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(solid,,
-[  --with-solid[=DIR]      Include Solid support [/usr/local/solid]])
+[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]])
 
   if test "$PHP_SOLID" != "no"; then
     AC_MSG_CHECKING(for Solid support)
@@ -171,7 +171,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(ibm-db2,,
-[  --with-ibm-db2[=DIR]    Include IBM DB2 support [/home/db2inst1/sqllib]])
+[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]])
 
   if test "$PHP_IBM_DB2" != "no"; then
     AC_MSG_CHECKING(for IBM DB2 support)
@@ -208,7 +208,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(ODBCRouter,,
-[  --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]])
+[  --with-ODBCRouter[=DIR]   Include ODBCRouter.com support [/usr]])
 
   if test "$PHP_ODBCROUTER" != "no"; then
     AC_MSG_CHECKING(for ODBCRouter.com support)
@@ -228,7 +228,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(empress,,
-[  --with-empress[=DIR]    Include Empress support [\$EMPRESSPATH]
+[  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
                           (Empress Version >= 8.60 required)])
 
   if test "$PHP_EMPRESS" != "no"; then
@@ -291,7 +291,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(birdstep,,
-[  --with-birdstep[=DIR]   Include Birdstep support [/usr/local/birdstep]])
+[  --with-birdstep[=DIR]     Include Birdstep support [/usr/local/birdstep]])
   
   if test "$PHP_BIRDSTEP" != "no"; then
     AC_MSG_CHECKING(for Birdstep support)
@@ -338,15 +338,14 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(custom-odbc,,
-[  --with-custom-odbc[=DIR]
-                          Include user defined ODBC support. DIR is ODBC install base
+[  --with-custom-odbc[=DIR]  Include user defined ODBC support. DIR is ODBC install base
                           directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and
                           have some odbc.h in your include dirs. f.e. you should define 
                           following for Sybase SQL Anywhere 5.5.00 on QNX, prior to
                           running this configure script:
-                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
-                              LDFLAGS=-lunix
-                              CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
+                            CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
+                            LDFLAGS=-lunix
+                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
 
   if test "$PHP_CUSTOM_ODBC" != "no"; then
     AC_MSG_CHECKING(for a custom ODBC support)
@@ -366,7 +365,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(iodbc,,
-[  --with-iodbc[=DIR]      Include iODBC support [/usr/local]])
+[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
 
   if test "$PHP_IODBC" != "no"; then
     AC_MSG_CHECKING(for iODBC support)
@@ -387,7 +386,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(esoob,,
-[  --with-esoob[=DIR]      Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
+[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
 
   if test "$PHP_ESOOB" != "no"; then
     AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
@@ -407,7 +406,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(unixODBC,,
-[  --with-unixODBC[=DIR]   Include unixODBC support [/usr/local]])
+[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
 
   if test "$PHP_UNIXODBC" != "no"; then
     AC_MSG_CHECKING(for unixODBC support)
@@ -428,7 +427,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(dbmaker,,
-[  --with-dbmaker[=DIR]    Include DBMaker support])
+[  --with-dbmaker[=DIR]      Include DBMaker support])
 
   if test "$PHP_DBMAKER" != "no"; then
     AC_MSG_CHECKING(for DBMaker support)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 61c685f4b3..1798fe13fa 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_ENABLE(opcache, whether to enable Zend OPcache support,
-[  --enable-opcache Enable Zend OPcache support], yes)
+[  --enable-opcache        Enable Zend OPcache support], yes)
 
 if test "$PHP_OPCACHE" != "no"; then
 
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index 2c7f4fb691..a97114f808 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(openssl, for OpenSSL support,
-[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.6)])
+[  --with-openssl[=DIR]      Include OpenSSL support (requires OpenSSL >= 0.9.6)])
 
 PHP_ARG_WITH(kerberos, for Kerberos support,
 [  --with-kerberos[=DIR]     OPENSSL: Include Kerberos support], no, no)
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
index 7b6f669a50..a89ab2aea5 100644
--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@ -4,7 +4,7 @@ dnl
 
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
 [  --with-pdo-firebird[=DIR] PDO: Firebird support.  DIR is the Firebird base
-                            install directory [/opt/firebird]])
+                          install directory [/opt/firebird]])
 
 if test "$PHP_PDO_FIREBIRD" != "no"; then
 
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index a2ba2fdbdd..f237f413be 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -4,12 +4,12 @@ dnl vim: se ts=2 sw=2 et:
 
 PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO,
 [  --with-pdo-mysql[=DIR]    PDO: MySQL support. DIR is the MySQL base directory
-                                 If no value or mysqlnd is passed as DIR, the
-                                 MySQL native driver will be used])
+                          If no value or mysqlnd is passed as DIR, the
+                          MySQL native driver will be used])
 
 if test -z "$PHP_ZLIB_DIR"; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,
-  [  --with-zlib-dir[=DIR]       PDO_MySQL: Set the path to libz install prefix], no, no)
+  [  --with-zlib-dir[=DIR]     PDO_MySQL: Set the path to libz install prefix], no, no)
 fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 0e42d1f9a9..e3795db0ea 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -42,11 +42,11 @@ AC_DEFUN([AC_PDO_OCI_CHECK_LIB_DIR],[
 
 PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO,
 [  --with-pdo-oci[=DIR]      PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME.
-                            Use --with-pdo-oci=instantclient,prefix,version 
-                            for an Oracle Instant Client SDK. 
-                            For example on Linux with 11.2 RPMs use:
+                          Use --with-pdo-oci=instantclient,prefix,version 
+                          for an Oracle Instant Client SDK. 
+                          For example on Linux with 11.2 RPMs use:
                             --with-pdo-oci=instantclient,/usr,11.2
-                            With 10.2 RPMs use:
+                          With 10.2 RPMs use:
                             --with-pdo-oci=instantclient,/usr,10.2.0.4])
 
 if test "$PHP_PDO_OCI" != "no"; then
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index b70dc9d539..74734c4d63 100755
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -3,25 +3,25 @@ dnl config.m4 for extension pdo_odbc
 dnl vim:et:sw=2:ts=2:
 
 define([PDO_ODBC_HELP_TEXT],[[
-                            include and lib dirs are looked for under 'dir'.
-                            
-                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
-                            If ',dir' part is omitted, default for the flavour 
-                            you have selected will used. e.g.:
-                            
-                              --with-pdo-odbc=unixODBC
-                              
-                            will check for unixODBC under /usr/local. You may attempt 
-                            to use an otherwise unsupported driver using the \"generic\" 
-                            flavour.  The syntax for generic ODBC support is:
-                            
-                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
-
-                            When build as shared the extension filename is always pdo_odbc.so]])
+			  include and lib dirs are looked for under 'dir'.
+
+			  'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
+			  If ',dir' part is omitted, default for the flavour 
+			  you have selected will be used. e.g.:
+
+			    --with-pdo-odbc=unixODBC
+
+			  will check for unixODBC under /usr/local. You may attempt 
+			  to use an otherwise unsupported driver using the \"generic\" 
+			  flavour.  The syntax for generic ODBC support is:
+
+			    --with-pdo-odbc=generic,dir,libname,ldflags,cflags
+
+			  When built as 'shared' the extension filename is always pdo_odbc.so]])
 
 PHP_ARG_WITH(pdo-odbc, for ODBC v3 support for PDO,
 [  --with-pdo-odbc=flavour,dir
-                            PDO: Support for 'flavour' ODBC driver.]PDO_ODBC_HELP_TEXT)
+                          PDO: Support for 'flavour' ODBC driver.]PDO_ODBC_HELP_TEXT)
 
 
 AC_DEFUN([PDO_ODBC_CHECK_HEADER],[
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index f9254a8fd9..afe42e06a5 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -4,7 +4,7 @@ dnl vim:et:sw=2:ts=2:
 
 PHP_ARG_WITH(pdo-pgsql,for PostgreSQL support for PDO,
 [  --with-pdo-pgsql[=DIR]    PDO: PostgreSQL support.  DIR is the PostgreSQL base
-                            install directory or the path to pg_config])
+                          install directory or the path to pg_config])
 
 if test "$PHP_PDO_PGSQL" != "no"; then
 
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index b2b70a5038..0a7d0fe826 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -4,8 +4,8 @@ dnl vim:et:sw=2:ts=2:
 
 PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO,
 [  --without-pdo-sqlite[=DIR]
-                            PDO: sqlite 3 support.  DIR is the sqlite base
-                            install directory [BUNDLED]], $PHP_PDO)
+                          PDO: sqlite 3 support.  DIR is the sqlite base
+                          install directory [BUNDLED]], $PHP_PDO)
 
 if test "$PHP_PDO_SQLITE" != "no"; then
 
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index bddb77a151..13837bd832 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(pgsql,for PostgreSQL support,
-[  --with-pgsql[=DIR]      Include PostgreSQL support.  DIR is the PostgreSQL
+[  --with-pgsql[=DIR]        Include PostgreSQL support.  DIR is the PostgreSQL
                           base install directory or the path to pg_config])
 
 if test "$PHP_PGSQL" != "no"; then
diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4
index 67e5b27605..481a9ae891 100644
--- a/ext/pspell/config.m4
+++ b/ext/pspell/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(pspell,for PSPELL support,
-[  --with-pspell[=DIR]     Include PSPELL support.
+[  --with-pspell[=DIR]       Include PSPELL support.
                           GNU Aspell version 0.50.0 or higher required])
 
 if test "$PHP_PSPELL" != "no"; then
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index b1cb0b67e8..0a00370fce 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -3,11 +3,11 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(libedit,for libedit readline replacement, 
-[  --with-libedit[=DIR]    Include libedit readline replacement (CLI/CGI only)])
+[  --with-libedit[=DIR]      Include libedit readline replacement (CLI/CGI only)])
 
 if test "$PHP_LIBEDIT" = "no"; then
   PHP_ARG_WITH(readline,for readline support,
-  [  --with-readline[=DIR]   Include readline support (CLI/CGI only)])
+  [  --with-readline[=DIR]     Include readline support (CLI/CGI only)])
 else
   dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
   php_with_readline=no
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4
index 8df4cfc41a..7f394d0465 100644
--- a/ext/recode/config.m4
+++ b/ext/recode/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(recode,for recode support,
-[  --with-recode[=DIR]     Include recode support])
+[  --with-recode[=DIR]       Include recode support])
 
 if test "$PHP_RECODE" != "no"; then
   RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index 2145e23d88..387a24ea21 100644
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -6,7 +6,7 @@ PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     SimpleXML: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   SimpleXML: libxml2 install prefix], no, no)
 fi
 
 if test "$PHP_SIMPLEXML" != "no"; then
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 9c0b82f778..dd7a3bf68d 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(snmp,for SNMP support,
-[  --with-snmp[=DIR]       Include SNMP support])
+[  --with-snmp[=DIR]         Include SNMP support])
 
 PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
 [  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4
index 8acad8dee3..7fa8c6f0ec 100644
--- a/ext/soap/config.m4
+++ b/ext/soap/config.m4
@@ -6,7 +6,7 @@ PHP_ARG_ENABLE(soap, whether to enable SOAP support,
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     SOAP: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   SOAP: libxml2 install prefix], no, no)
 fi
 
 if test "$PHP_SOAP" != "no"; then
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index 1365def033..6959a6f916 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -3,7 +3,7 @@ dnl config.m4 for extension sqlite3
 dnl vim:et:ts=2:sw=2
 
 PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension,
-[  --without-sqlite3[=DIR] Do not include SQLite3 support. DIR is the prefix to
+[  --without-sqlite3[=DIR]   Do not include SQLite3 support. DIR is the prefix to
                           SQLite3 installation directory.], yes)
 
 if test $PHP_SQLITE3 != "no"; then
diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
index 81df1f3126..276fe12675 100644
--- a/ext/sybase_ct/config.m4
+++ b/ext/sybase_ct/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(sybase-ct, for Sybase-CT support,
-[  --with-sybase-ct[=DIR]  Include Sybase-CT support.  DIR is the Sybase home
+[  --with-sybase-ct[=DIR]    Include Sybase-CT support.  DIR is the Sybase home
                           directory [/home/sybase]])
 
 if test "$PHP_SYBASE_CT" != "no"; then
diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index 675498c8ce..102f6a827e 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(tidy,for TIDY support,
-[  --with-tidy[=DIR]       Include TIDY support])
+[  --with-tidy[=DIR]         Include TIDY support])
 
 if test "$PHP_TIDY" != "no"; then
 
diff --git a/ext/wddx/config.m4 b/ext/wddx/config.m4
index 2b02a92aa9..8f933d490a 100644
--- a/ext/wddx/config.m4
+++ b/ext/wddx/config.m4
@@ -7,11 +7,11 @@ PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     WDDX: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   WDDX: libxml2 install prefix], no, no)
 fi
 
 PHP_ARG_WITH(libexpat-dir, libexpat dir for WDDX,
-[  --with-libexpat-dir=DIR   WDDX: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
+[  --with-libexpat-dir=DIR WDDX: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
 
 if test "$PHP_WDDX" != "no"; then
 
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 65f22915b9..ebfc0471e0 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -7,11 +7,11 @@ PHP_ARG_ENABLE(xml,whether to enable XML support,
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     XML: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   XML: libxml2 install prefix], no, no)
 fi
 
 PHP_ARG_WITH(libexpat-dir, libexpat install dir,
-[  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
+[  --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no, no)
 
 if test "$PHP_XML" != "no"; then
 
diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4
index 3614996fb4..d346b58eea 100644
--- a/ext/xmlreader/config.m4
+++ b/ext/xmlreader/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_ENABLE(xmlreader, whether to enable XMLReader support,
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     XMLReader: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   XMLReader: libxml2 install prefix], no, no)
 fi
 
 if test "$PHP_XMLREADER" != "no"; then
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 389d4adaf0..f82016edcb 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -8,18 +8,18 @@ sinclude(libxmlrpc/acinclude.m4)
 sinclude(libxmlrpc/xmlrpc.m4)
 
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
-[  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support])
+[  --with-xmlrpc[=DIR]       Include XMLRPC-EPI support])
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     XMLRPC-EPI: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   XMLRPC-EPI: libxml2 install prefix], no, no)
 fi
 
 PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI,
-[  --with-libexpat-dir=DIR   XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
+[  --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
 
 PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
-[  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no)
+[  --with-iconv-dir=DIR    XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no)
 
 if test "$PHP_XMLRPC" != "no"; then
 
diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4
index 0a5d079430..b3b98012f8 100644
--- a/ext/xmlwriter/config.m4
+++ b/ext/xmlwriter/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_ENABLE(xmlwriter, whether to enable XMLWriter support,
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     XMLWriter: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR   XMLWriter: libxml2 install prefix], no, no)
 fi
 
 if test "$PHP_XMLWRITER" != "no"; then
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index a2b16d24f0..9b6f8aaa49 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(xsl, for XSL support,
-[  --with-xsl[=DIR]        Include XSL support.  DIR is the libxslt base
+[  --with-xsl[=DIR]          Include XSL support.  DIR is the libxslt base
                           install directory (libxslt >= 1.1.0 required)])
 
 if test "$PHP_XSL" != "no"; then
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 85f9119f5a..805d92442e 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -11,7 +11,7 @@ if test -z "$PHP_ZLIB_DIR"; then
 fi
 
 PHP_ARG_WITH(pcre-dir, pcre install prefix,
-[  --with-pcre-dir           ZIP: pcre install prefix], no, no)
+[  --with-pcre-dir         ZIP: pcre install prefix], no, no)
 
 if test "$PHP_ZIP" != "no"; then
 
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index 25c7f4f420..ebf67cc001 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(zlib,for ZLIB support,
-[  --with-zlib[=DIR]       Include ZLIB support (requires zlib >= 1.0.9)])
+[  --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)