summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.in3
-rw-r--r--ext/dom/config.m42
-rw-r--r--ext/gd/config.m44
-rw-r--r--ext/hash/config.m42
-rw-r--r--ext/interbase/config.m42
-rw-r--r--ext/json/config.m44
-rw-r--r--ext/libxml/config0.m44
-rw-r--r--ext/mbstring/config.m47
-rw-r--r--ext/mime_magic/config.m42
-rw-r--r--ext/msql/config.m42
-rw-r--r--ext/mssql/config.m42
-rw-r--r--ext/mysqli/config.m44
-rw-r--r--ext/oci8/config.m47
-rw-r--r--ext/odbc/config.m458
-rw-r--r--ext/pcre/config0.m46
-rw-r--r--ext/pdo_dblib/config.m44
-rw-r--r--ext/pdo_firebird/config.m42
-rwxr-xr-xext/pdo_mysql/config.m42
-rwxr-xr-xext/pdo_oci/config.m47
-rw-r--r--ext/pdo_sqlite/config.m44
-rw-r--r--ext/snmp/config.m42
-rw-r--r--ext/sqlite/config.m46
-rw-r--r--ext/sybase/config.m42
-rw-r--r--ext/sybase_ct/config.m42
-rw-r--r--ext/xsl/config.m44
-rw-r--r--ext/zip/config.m44
-rw-r--r--sapi/cgi/config9.m415
27 files changed, 69 insertions, 94 deletions
diff --git a/configure.in b/configure.in
index 9bcd0827ba..6045367b8e 100644
--- a/configure.in
+++ b/configure.in
@@ -722,8 +722,7 @@ esac
PHP_ARG_WITH(config-file-path,[path to configuration file],
[ --with-config-file-path=PATH
- Set the path in which to look for php.ini
- [PREFIX/lib]], DEFAULT, no)
+ Set the path in which to look for php.ini [PREFIX/lib]], DEFAULT, no)
if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
case $PHP_LAYOUT in
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index 4a083e4509..7882483b30 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
dnl
PHP_ARG_ENABLE(dom, whether to enable DOM support,
-[ --disable-dom Disable new DOM support], yes)
+[ --disable-dom Disable DOM support], yes)
if test -z "$PHP_LIBXML_DIR"; then
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 0b86f6194c..e9ec2bddc6 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -7,8 +7,8 @@ dnl Configure options
dnl
PHP_ARG_WITH(gd, for GD support,
-[ --with-gd[=DIR] Include GD support where DIR is GD install prefix.
- If DIR is not set, the bundled GD library will be used])
+[ --with-gd[=DIR] Include GD support. DIR is the GD library base
+ install directory [BUNDLED]])
if test -z "$PHP_JPEG_DIR"; then
PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 99c8ed3e13..392398729e 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_ENABLE(hash, whether to enable hash support,
-[ --disable-hash Disable hash support], yes)
+[ --disable-hash Disable hash support], yes)
if test "$PHP_HASH" != "no"; then
AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension])
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 5f8d66ba8b..f7265c2bf4 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -4,7 +4,7 @@ dnl
PHP_ARG_WITH(interbase,for InterBase support,
[ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base
- install directory, defaults to /usr/interbase])
+ install directory [/usr/interbase]])
if test "$PHP_INTERBASE" != "no"; then
if test "$PHP_INTERBASE" = "yes"; then
diff --git a/ext/json/config.m4 b/ext/json/config.m4
index b5c50cc0e5..ade797a12d 100644
--- a/ext/json/config.m4
+++ b/ext/json/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
dnl
PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
-[ --disable-json Disable JavaScript Object Serialization support], yes)
+[ --disable-json Disable JavaScript Object Serialization support], yes)
if test "$PHP_JSON" != "no"; then
AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support])
@@ -12,5 +12,3 @@ if test "$PHP_JSON" != "no"; then
PHP_NEW_EXTENSION(json, json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c, $ext_shared)
PHP_SUBST(JSON_SHARED_LIBADD)
fi
-
-# vim600: sts=2 sw=2 et
diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4
index b6ff14edef..14f5868493 100644
--- a/ext/libxml/config0.m4
+++ b/ext/libxml/config0.m4
@@ -3,11 +3,11 @@ dnl $Id$
dnl
PHP_ARG_ENABLE(libxml, whether to enable LIBXML support,
-[ --disable-libxml Disable new LIBXML support], yes)
+[ --disable-libxml Disable LIBXML support], yes)
if test -z "$PHP_LIBXML_DIR"; then
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
- [ --with-libxml-dir[=DIR] libxml2 install prefix], no, no)
+ [ --with-libxml-dir[=DIR] LIBXML: libxml2 install prefix], no, no)
fi
if test "$PHP_LIBXML" != "no"; then
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 19b2c399e6..121d1e3f70 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -286,11 +286,12 @@ PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support],
[ --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)
+[ --disable-mbregex-backtrack
+ 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 install prefix.
- If DIR is not set, the bundled libmbfl will be used], no, no)
+[ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl base
+ install directory [BUNDLED]], no, no)
if test "$PHP_MBSTRING" != "no"; then
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
diff --git a/ext/mime_magic/config.m4 b/ext/mime_magic/config.m4
index 0e53bc5d56..4189a3a695 100644
--- a/ext/mime_magic/config.m4
+++ b/ext/mime_magic/config.m4
@@ -4,7 +4,7 @@ dnl
PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
[ --with-mime-magic[=FILE]
- Include mime_magic support (deprecated)])
+ Include mime_magic support (DEPRECATED!!)])
if test "$PHP_MIME_MAGIC" != "no"; then
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
index 3842fe4463..ec75777fe6 100644
--- a/ext/msql/config.m4
+++ b/ext/msql/config.m4
@@ -23,7 +23,7 @@ AC_DEFUN([PHP_MSQL_VERSION],[
PHP_ARG_WITH(msql,for mSQL support,
[ --with-msql[=DIR] Include mSQL support. DIR is the mSQL base
- install directory, defaults to /usr/local/Hughes])
+ install directory [/usr/local/Hughes]])
if test "$PHP_MSQL" != "no"; then
if test "$PHP_MSQL" = "yes"; then
diff --git a/ext/mssql/config.m4 b/ext/mssql/config.m4
index aa599d7743..36a1feb75b 100644
--- a/ext/mssql/config.m4
+++ b/ext/mssql/config.m4
@@ -4,7 +4,7 @@ dnl
PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS,
[ --with-mssql[=DIR] Include MSSQL-DB support. DIR is the FreeTDS home
- directory, defaults to /usr/local/freetds])
+ directory [/usr/local/freetds]])
if test "$PHP_MSSQL" != "no"; then
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 2c1af87054..19bc252bb0 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -3,8 +3,8 @@ dnl $Id$
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
-[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname
- to mysql_config])
+[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname
+ to mysql_config [mysql_config]])
PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no)
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 227c08edc5..f858c4cf78 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -96,10 +96,9 @@ 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 (OCI8) support,
-[ --with-oci8[=DIR] Include Oracle (OCI8) support.
- The default DIR is ORACLE_HOME.
- Use --with-oci8=instantclient,/path/to/oic/lib
- to use an Oracle Instant Client installation])
+[ --with-oci8[=DIR] Include Oracle (OCI8) support. DIR defaults to \$ORACLE_HOME.
+ Use --with-oci8=instantclient,/path/to/oic/lib
+ for an Oracle Instant Client installation])
AC_MSG_CHECKING([PHP version])
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 601c95d853..00ac70bb27 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -99,8 +99,7 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Adabas support)
AC_ARG_WITH(adabas,
-[ --with-adabas[=DIR] Include Adabas D support. DIR is the Adabas base
- install directory [/usr/local]],
+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -132,8 +131,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for SAP DB support)
AC_ARG_WITH(sapdb,
-[ --with-sapdb[=DIR] Include SAP DB support. DIR is SAP DB base
- install directory [/usr/local]],
+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -158,8 +156,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Solid support)
AC_ARG_WITH(solid,
-[ --with-solid[=DIR] Include Solid support. DIR is the Solid base
- install directory, defaults to /usr/local/solid],
+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -190,8 +187,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for IBM DB2 support)
AC_ARG_WITH(ibm-db2,
-[ --with-ibm-db2[=DIR] Include IBM DB2 support. DIR is the DB2 base
- install directory, defaults to /home/db2inst1/sqllib],
+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]],
[
PHP_WITH_SHARED
if test "$withval" != "no"; then
@@ -234,8 +230,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for ODBCRouter.com support)
AC_ARG_WITH(ODBCRouter,
-[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support. DIR is ODBCRouter base
- install directory [/usr]],
+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -261,10 +256,8 @@ fi
if test -z "$ODBC_TYPE"; then
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 PHP 4, this option only supports Empress Version
- 8.60 and above],
+[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH]
+ (Empress Version >= 8.60 required)],
[
PHP_WITH_SHARED
if test "$withval" != "no"; then
@@ -293,9 +286,8 @@ 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. (Empress Version >= 8.60 required)
- [\$EMPRESSPATH]],
+ Include Empress Local Access support [\$EMPRESSPATH]
+ (Empress Version >= 8.60 required)],
[
PHP_WITH_SHARED
if test "$withval" != "no"; then
@@ -339,8 +331,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Birdstep support)
AC_ARG_WITH(birdstep,
-[ --with-birdstep[=DIR] Include Birdstep support. DIR is the Birdstep base
- install directory [/usr/local/birdstep]],
+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]],
[
PHP_WITH_SHARED
@@ -395,15 +386,12 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for a custom ODBC support)
AC_ARG_WITH(custom-odbc,
-[ --with-custom-odbc[=DIR]
- Include a user defined ODBC support.
- The DIR is ODBC install base directory,
- which defaults to /usr/local.
- Make sure to define CUSTOM_ODBC_LIBS and
- have some odbc.h in your include dirs.
- E.g., you should define following for
- Sybase SQL Anywhere 5.5.00 on QNX, prior to
- run configure script:
+[ --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\"],
@@ -431,8 +419,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for iODBC support)
AC_ARG_WITH(iodbc,
-[ --with-iodbc[=DIR] Include iODBC support. DIR is the iODBC base
- install directory [/usr/local]],
+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -459,8 +446,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
AC_ARG_WITH(esoob,
-[ --with-esoob[=DIR] Include Easysoft OOB support. DIR is the OOB base
- install directory [/usr/local/easysoft/oob/client]],
+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -486,8 +472,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for unixODBC support)
AC_ARG_WITH(unixODBC,
-[ --with-unixODBC[=DIR] Include unixODBC support. DIR is the unixODBC base
- install directory [/usr/local]],
+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
@@ -514,10 +499,7 @@ fi
if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for DBMaker support)
AC_ARG_WITH(dbmaker,
-[ --with-dbmaker[=DIR] Include DBMaker support. DIR is the DBMaker base
- install directory, defaults to where the latest
- version of DBMaker is installed (such as
- /home/dbmaker/3.6)],
+[ --with-dbmaker[=DIR] Include DBMaker support],
[
PHP_WITH_SHARED
if test "$withval" = "yes"; then
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index ea0184537d..373af4e9bd 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -6,10 +6,8 @@ dnl By default we'll compile and link against the bundled PCRE library
dnl if DIR is supplied, we'll use that for linking
PHP_ARG_WITH(pcre-regex,for PCRE support,
-[ --without-pcre-regex Do not include Perl Compatible Regular Expressions
- support. Use --with-pcre-regex=DIR to specify DIR
- where PCRE's include and library files are located,
- if not using bundled library.],yes)
+[ --without-pcre-regex Do not include Perl Compatible Regular Expressions support.
+ DIR is the PCRE install prefix [BUNDLED]], yes)
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index 407edc5f2e..b66dd433d2 100644
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -4,8 +4,8 @@ dnl
if test "$PHP_PDO" != "no"; then
PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
-[ --with-pdo-dblib[=DIR] Include PDO_DBLIB-DB support. DIR is the FreeTDS home
- directory])
+[ --with-pdo-dblib[=DIR] PDO: DBLIB-DB support. DIR is the FreeTDS home
+ directory])
if test "$PHP_PDO_DBLIB" != "no"; then
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
index 90aa1a9e21..80f24c4da6 100644
--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@ -6,7 +6,7 @@ if test "$PHP_PDO" != "no"; then
PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
[ --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base
- install directory, defaults to /opt/firebird])
+ install directory [/opt/firebird]])
if test "$PHP_PDO_FIREBIRD" != "no"; then
if test "$PHP_PDO_FIREBIRD" = "yes"; then
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index a505d84d9a..e76b6659e2 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -19,7 +19,7 @@ PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO,
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 6f8f9c4982..6f35ad6b16 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -52,9 +52,10 @@ 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. Default DIR is ORACLE_HOME.
- You may also use --with-pdo-oci=instantclient,prefix,version to use
- the InstantClient SDK. For Linux with 10.1.0.3 rpms (for example) use:
+[ --with-pdo-oci[=DIR] PDO: Oracle-OCI support. DIR defaults to \$ORACLE_HOME.
+ Use --with-pdo-oci=instantclient,prefix,version
+ for an Oracle InstantClient SDK.
+ For Linux with 10.1.0.3 rpms (for example) use:
--with-pdo-oci=instantclient,/usr,10.1.0.3])
if test "$PHP_PDO_OCI" != "no"; then
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index c89f1b0ba5..3f1090756a 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -5,7 +5,9 @@ dnl vim:et:sw=2:ts=2:
if test "$PHP_PDO" != "no"; then
PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO,
-[ --without-pdo-sqlite[=DIR] PDO: sqlite support. DIR is the sqlite base directory, the bundled sqlite is used by default],yes)
+[ --without-pdo-sqlite[=DIR]
+ PDO: sqlite 3 support. DIR is the sqlite base
+ install directory [BUNDLED]], yes)
if test "$PHP_PDO_SQLITE" != "no"; then
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 5e7b0a468b..1fc718024f 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -125,7 +125,7 @@ fi
AC_MSG_CHECKING(whether to enable UCD SNMP hack)
AC_ARG_ENABLE(ucd-snmp-hack,
-[ --enable-ucd-snmp-hack SNMP: Enable UCD SNMP hack],[
+[ --enable-ucd-snmp-hack SNMP: Enable UCD SNMP hack],[
if test "$enableval" = "yes" ; then
AC_DEFINE(UCD_SNMP_HACK, 1, [ ])
AC_MSG_RESULT(yes)
diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4
index 8a1f555007..399743514b 100644
--- a/ext/sqlite/config.m4
+++ b/ext/sqlite/config.m4
@@ -3,10 +3,8 @@ dnl config.m4 for extension sqlite
dnl vim:et:ts=2:sw=2
PHP_ARG_WITH(sqlite, for sqlite support,
-[ --without-sqlite Do not include sqlite support.
- Use --with-sqlite=DIR to specify DIR where
- Sqlite include and library files are located,
- if not using bundled library.], yes)
+[ --without-sqlite Do not include sqlite support. DIR is the sqlite base
+ install directory [BUNDLED]], yes)
PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1),
[ --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite], no, no)
diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4
index b8993ef4a7..742a5e62db 100644
--- a/ext/sybase/config.m4
+++ b/ext/sybase/config.m4
@@ -4,7 +4,7 @@ dnl
PHP_ARG_WITH(sybase,for Sybase support,
[ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home
- directory, defaults to /home/sybase])
+ directory [/home/sybase]])
if test "$PHP_SYBASE" != "no"; then
if test "$PHP_SYBASE" = "yes"; then
diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
index cb133e957b..00d5b9cc19 100644
--- a/ext/sybase_ct/config.m4
+++ b/ext/sybase_ct/config.m4
@@ -4,7 +4,7 @@ dnl
PHP_ARG_WITH(sybase-ct, for Sybase-CT support,
[ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home
- directory. Defaults to /home/sybase])
+ directory [/home/sybase]])
if test "$PHP_SYBASE_CT" != "no"; then
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index d1849f74c3..a2b16d24f0 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -3,8 +3,8 @@ dnl $Id$
dnl
PHP_ARG_WITH(xsl, for XSL support,
-[ --with-xsl[=DIR] Include new XSL support (requires libxslt >= 1.1.0).
- DIR is the libxslt install directory])
+[ --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 a520903a16..c5edaa725e 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -3,11 +3,11 @@ dnl $Id$
dnl
PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
-[ --enable-zip Include Zip read/write support.])
+[ --enable-zip Include Zip read/write support])
if test -z "$PHP_ZLIB_DIR"; then
PHP_ARG_WITH(zlib-dir, for the location of libz,
-[ --with-zlib-dir[=DIR] zip: Set the path to libz install prefix.], no, no)
+[ --with-zlib-dir[=DIR] ZIP: Set the path to libz install prefix], no, no)
fi
if test "$PHP_ZIP" != "no"; then
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index c9ca3a3457..e465eaea67 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -12,9 +12,8 @@ AC_ARG_ENABLE(cgi,
AC_ARG_ENABLE(force-cgi-redirect,
[ --enable-force-cgi-redirect
- CGI: Enable the security check for internal server
- redirects. You should use this if you are
- running the CGI version with Apache],
+ CGI: Enable security check for internal server
+ redirects. Use this if you run the PHP CGI with Apache],
[
PHP_FORCE_CGI_REDIRECT=$enableval
],[
@@ -22,10 +21,9 @@ AC_ARG_ENABLE(force-cgi-redirect,
])
AC_ARG_ENABLE(discard-path,
-[ --enable-discard-path CGI: 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],
+[ --enable-discard-path CGI: When 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],
[
PHP_DISCARD_PATH=$enableval
],[
@@ -33,8 +31,7 @@ AC_ARG_ENABLE(discard-path,
])
AC_ARG_ENABLE(fastcgi,
-[ --enable-fastcgi CGI: If this is enabled, the cgi module will
- be built with support for fastcgi also],
+[ --enable-fastcgi CGI: Enable FastCGI support in the CGI binary],
[
PHP_ENABLE_FASTCGI=$enableval
],[
View Lorry Controller Status