sniper Tue Jul 3 17:25:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src configure.in
/php-src/ext/dom config.m4
/php-src/ext/gd config.m4
/php-src/ext/hash config.m4
/php-src/ext/interbase config.m4
/php-src/ext/json config.m4
/php-src/ext/libxml config0.m4
/php-src/ext/mbstring config.m4
/php-src/ext/mime_magic config.m4
/php-src/ext/msql config.m4
/php-src/ext/mssql config.m4
/php-src/ext/mysqli config.m4
/php-src/ext/oci8 config.m4
/php-src/ext/odbc config.m4
/php-src/ext/pcre config0.m4
/php-src/ext/pdo_dblib config.m4
/php-src/ext/pdo_firebird config.m4
/php-src/ext/pdo_mysql config.m4
/php-src/ext/pdo_oci config.m4
/php-src/ext/pdo_sqlite config.m4
/php-src/ext/snmp config.m4
/php-src/ext/sqlite config.m4
/php-src/ext/sybase config.m4
/php-src/ext/sybase_ct config.m4
/php-src/ext/xsl config.m4
/php-src/ext/zip config.m4
/php-src/sapi/cgi config9.m4
Log:
MFH: Fix some configure --help texts
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.60&r2=1.579.2.52.2.61&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.60
php-src/configure.in:1.579.2.52.2.61
--- php-src/configure.in:1.579.2.52.2.60 Fri Jun 29 01:10:35 2007
+++ php-src/configure.in Tue Jul 3 17:25:33 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.60 2007/06/29 01:10:35 sniper Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.61 2007/07/03 17:25:33 sniper Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -722,8 +722,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.m4?r1=1.20&r2=1.20.4.1&diff_format=u
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.20 php-src/ext/dom/config.m4:1.20.4.1
--- php-src/ext/dom/config.m4:1.20 Sun May 29 23:16:40 2005
+++ php-src/ext/dom/config.m4 Tue Jul 3 17:25:33 2007
@@ -1,9 +1,9 @@
dnl
-dnl $Id: config.m4,v 1.20 2005/05/29 23:16:40 sniper Exp $
+dnl $Id: config.m4,v 1.20.4.1 2007/07/03 17:25:33 sniper Exp $
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,
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.5&r2=1.154.2.1.2.6&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.5
php-src/ext/gd/config.m4:1.154.2.1.2.6
--- php-src/ext/gd/config.m4:1.154.2.1.2.5 Fri Jun 1 21:34:17 2007
+++ php-src/ext/gd/config.m4 Tue Jul 3 17:25:33 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.5 2007/06/01 21:34:17 sniper Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6 2007/07/03 17:25:33 sniper Exp $
dnl
dnl
@@ -7,8 +7,8 @@
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,
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.m4?r1=1.10.2.4&r2=1.10.2.4.2.1&diff_format=u
Index: php-src/ext/hash/config.m4
diff -u php-src/ext/hash/config.m4:1.10.2.4
php-src/ext/hash/config.m4:1.10.2.4.2.1
--- php-src/ext/hash/config.m4:1.10.2.4 Sun Feb 19 23:39:53 2006
+++ php-src/ext/hash/config.m4 Tue Jul 3 17:25:33 2007
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.10.2.4 2006/02/19 23:39:53 mike Exp $
+dnl $Id: config.m4,v 1.10.2.4.2.1 2007/07/03 17:25:33 sniper Exp $
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])
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20&r2=1.20.6.1&diff_format=u
Index: php-src/ext/interbase/config.m4
diff -u php-src/ext/interbase/config.m4:1.20
php-src/ext/interbase/config.m4:1.20.6.1
--- php-src/ext/interbase/config.m4:1.20 Wed May 12 14:29:42 2004
+++ php-src/ext/interbase/config.m4 Tue Jul 3 17:25:33 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.20 2004/05/12 14:29:42 abies Exp $
+dnl $Id: config.m4,v 1.20.6.1 2007/07/03 17:25:33 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.3.2.3&r2=1.3.2.4&diff_format=u
Index: php-src/ext/json/config.m4
diff -u php-src/ext/json/config.m4:1.3.2.3 php-src/ext/json/config.m4:1.3.2.4
--- php-src/ext/json/config.m4:1.3.2.3 Thu Jul 20 10:47:37 2006
+++ php-src/ext/json/config.m4 Tue Jul 3 17:25:33 2007
@@ -1,9 +1,9 @@
dnl
-dnl $Id: config.m4,v 1.3.2.3 2006/07/20 10:47:37 tony2001 Exp $
+dnl $Id: config.m4,v 1.3.2.4 2007/07/03 17:25:33 sniper Exp $
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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config0.m4?r1=1.3&r2=1.3.4.1&diff_format=u
Index: php-src/ext/libxml/config0.m4
diff -u php-src/ext/libxml/config0.m4:1.3 php-src/ext/libxml/config0.m4:1.3.4.1
--- php-src/ext/libxml/config0.m4:1.3 Sun May 29 23:16:41 2005
+++ php-src/ext/libxml/config0.m4 Tue Jul 3 17:25:33 2007
@@ -1,13 +1,13 @@
dnl
-dnl $Id: config0.m4,v 1.3 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config0.m4,v 1.3.4.1 2007/07/03 17:25:33 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.8&r2=1.58.2.4.2.9&diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.8
php-src/ext/mbstring/config.m4:1.58.2.4.2.9
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.8 Mon Jan 29 22:53:47 2007
+++ php-src/ext/mbstring/config.m4 Tue Jul 3 17:25:33 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.58.2.4.2.8 2007/01/29 22:53:47 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.9 2007/07/03 17:25:33 sniper Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -286,11 +286,12 @@
[ --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])
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/config.m4?r1=1.12&r2=1.12.6.1&diff_format=u
Index: php-src/ext/mime_magic/config.m4
diff -u php-src/ext/mime_magic/config.m4:1.12
php-src/ext/mime_magic/config.m4:1.12.6.1
--- php-src/ext/mime_magic/config.m4:1.12 Thu Apr 22 01:24:12 2004
+++ php-src/ext/mime_magic/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.12 2004/04/22 01:24:12 hholzgra Exp $
+dnl $Id: config.m4,v 1.12.6.1 2007/07/03 17:25:34 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/msql/config.m4?r1=1.14&r2=1.14.4.1&diff_format=u
Index: php-src/ext/msql/config.m4
diff -u php-src/ext/msql/config.m4:1.14 php-src/ext/msql/config.m4:1.14.4.1
--- php-src/ext/msql/config.m4:1.14 Sun May 29 23:16:42 2005
+++ php-src/ext/msql/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14 2005/05/29 23:16:42 sniper Exp $
+dnl $Id: config.m4,v 1.14.4.1 2007/07/03 17:25:34 sniper Exp $
dnl
dnl
@@ -23,7 +23,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/config.m4?r1=1.9.2.2&r2=1.9.2.2.2.1&diff_format=u
Index: php-src/ext/mssql/config.m4
diff -u php-src/ext/mssql/config.m4:1.9.2.2
php-src/ext/mssql/config.m4:1.9.2.2.2.1
--- php-src/ext/mssql/config.m4:1.9.2.2 Mon Oct 10 10:28:53 2005
+++ php-src/ext/mssql/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.9.2.2 2005/10/10 10:28:53 sniper Exp $
+dnl $Id: config.m4,v 1.9.2.2.2.1 2007/07/03 17:25:34 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.m4?r1=1.22.2.1.2.1&r2=1.22.2.1.2.2&diff_format=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.22.2.1.2.1
php-src/ext/mysqli/config.m4:1.22.2.1.2.2
--- php-src/ext/mysqli/config.m4:1.22.2.1.2.1 Thu Jun 1 19:14:48 2006
+++ php-src/ext/mysqli/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.22.2.1.2.1 2006/06/01 19:14:48 mike Exp $
+dnl $Id: config.m4,v 1.22.2.1.2.2 2007/07/03 17:25:34 sniper Exp $
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)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.6&r2=1.55.2.3.2.7&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.6
php-src/ext/oci8/config.m4:1.55.2.3.2.7
--- php-src/ext/oci8/config.m4:1.55.2.3.2.6 Fri May 4 11:30:37 2007
+++ php-src/ext/oci8/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55.2.3.2.6 2007/05/04 11:30:37 tony2001 Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.7 2007/07/03 17:25:34 sniper Exp $
dnl
if test -z "$SED"; then
@@ -96,10 +96,9 @@
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])
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.78.2.2&r2=1.78.2.2.2.1&diff_format=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.78.2.2
php-src/ext/odbc/config.m4:1.78.2.2.2.1
--- php-src/ext/odbc/config.m4:1.78.2.2 Tue Jan 10 14:15:35 2006
+++ php-src/ext/odbc/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.78.2.2 2006/01/10 14:15:35 tony2001 Exp $
+dnl $Id: config.m4,v 1.78.2.2.2.1 2007/07/03 17:25:34 sniper Exp $
dnl
AC_DEFUN([PHP_ODBC_CHECK_HEADER],[
@@ -99,8 +99,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.7&r2=1.38.2.3.2.8&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.7
php-src/ext/pcre/config0.m4:1.38.2.3.2.8
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.7 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/config0.m4 Tue Jul 3 17:25:34 2007
@@ -1,15 +1,13 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.7 2007/06/15 19:09:24 nlopess Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.8 2007/07/03 17:25:34 sniper Exp $
dnl
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
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.2.2.2&r2=1.2.2.2.2.1&diff_format=u
Index: php-src/ext/pdo_dblib/config.m4
diff -u php-src/ext/pdo_dblib/config.m4:1.2.2.2
php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1
--- php-src/ext/pdo_dblib/config.m4:1.2.2.2 Tue Nov 1 13:12:52 2005
+++ php-src/ext/pdo_dblib/config.m4 Tue Jul 3 17:25:34 2007
@@ -1,11 +1,11 @@
dnl
-dnl $Id: config.m4,v 1.2.2.2 2005/11/01 13:12:52 wez Exp $
+dnl $Id: config.m4,v 1.2.2.2.2.1 2007/07/03 17:25:34 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.8&r2=1.8.4.1&diff_format=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.8
php-src/ext/pdo_firebird/config.m4:1.8.4.1
--- php-src/ext/pdo_firebird/config.m4:1.8 Tue Jun 14 00:00:52 2005
+++ php-src/ext/pdo_firebird/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,12 +1,12 @@
dnl
-dnl $Id: config.m4,v 1.8 2005/06/14 00:00:52 sniper Exp $
+dnl $Id: config.m4,v 1.8.4.1 2007/07/03 17:25:35 sniper Exp $
dnl
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
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.4&r2=1.25.2.7.2.5&diff_format=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.4
php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.5
--- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.4 Wed Mar 7 09:36:22 2007
+++ php-src/ext/pdo_mysql/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.7.2.4 2007/03/07 09:36:22 tony2001 Exp $
+dnl $Id: config.m4,v 1.25.2.7.2.5 2007/07/03 17:25:35 sniper Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -19,7 +19,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.14.2.5&r2=1.14.2.5.2.1&diff_format=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14.2.5
php-src/ext/pdo_oci/config.m4:1.14.2.5.2.1
--- php-src/ext/pdo_oci/config.m4:1.14.2.5 Thu Feb 16 02:03:13 2006
+++ php-src/ext/pdo_oci/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.5 2006/02/16 02:03:13 pollita Exp $
+dnl $Id: config.m4,v 1.14.2.5.2.1 2007/07/03 17:25:35 sniper Exp $
if test "$PHP_PDO" != "no"; then
@@ -52,9 +52,10 @@
])
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
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.6&r2=1.26.2.9.2.7&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.6
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.6 Mon Jun 25 16:26:39 2007
+++ php-src/ext/pdo_sqlite/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,11 +1,13 @@
-dnl $Id: config.m4,v 1.26.2.9.2.6 2007/06/25 16:26:39 sniper Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.7 2007/07/03 17:25:35 sniper Exp $
dnl config.m4 for extension pdo_sqlite
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
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/config.m4?r1=1.32.2.1&r2=1.32.2.1.2.1&diff_format=u
Index: php-src/ext/snmp/config.m4
diff -u php-src/ext/snmp/config.m4:1.32.2.1
php-src/ext/snmp/config.m4:1.32.2.1.2.1
--- php-src/ext/snmp/config.m4:1.32.2.1 Tue Nov 29 18:26:00 2005
+++ php-src/ext/snmp/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.32.2.1 2005/11/29 18:26:00 tony2001 Exp $
+dnl $Id: config.m4,v 1.32.2.1.2.1 2007/07/03 17:25:35 sniper Exp $
dnl
PHP_ARG_WITH(snmp,for SNMP support,
@@ -125,7 +125,7 @@
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)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/config.m4?r1=1.41.2.1.2.1&r2=1.41.2.1.2.2&diff_format=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.41.2.1.2.1
php-src/ext/sqlite/config.m4:1.41.2.1.2.2
--- php-src/ext/sqlite/config.m4:1.41.2.1.2.1 Thu Apr 19 06:42:28 2007
+++ php-src/ext/sqlite/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,12 +1,10 @@
-dnl $Id: config.m4,v 1.41.2.1.2.1 2007/04/19 06:42:28 sas Exp $
+dnl $Id: config.m4,v 1.41.2.1.2.2 2007/07/03 17:25:35 sniper Exp $
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)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/config.m4?r1=1.11.2.1&r2=1.11.2.1.2.1&diff_format=u
Index: php-src/ext/sybase/config.m4
diff -u php-src/ext/sybase/config.m4:1.11.2.1
php-src/ext/sybase/config.m4:1.11.2.1.2.1
--- php-src/ext/sybase/config.m4:1.11.2.1 Wed Aug 31 22:28:46 2005
+++ php-src/ext/sybase/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.11.2.1 2005/08/31 22:28:46 sniper Exp $
+dnl $Id: config.m4,v 1.11.2.1.2.1 2007/07/03 17:25:35 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/config.m4?r1=1.15&r2=1.15.4.1&diff_format=u
Index: php-src/ext/sybase_ct/config.m4
diff -u php-src/ext/sybase_ct/config.m4:1.15
php-src/ext/sybase_ct/config.m4:1.15.4.1
--- php-src/ext/sybase_ct/config.m4:1.15 Sun May 29 23:16:44 2005
+++ php-src/ext/sybase_ct/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.15 2005/05/29 23:16:44 sniper Exp $
+dnl $Id: config.m4,v 1.15.4.1 2007/07/03 17:25:35 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/config.m4?r1=1.11.4.1&r2=1.11.4.2&diff_format=u
Index: php-src/ext/xsl/config.m4
diff -u php-src/ext/xsl/config.m4:1.11.4.1 php-src/ext/xsl/config.m4:1.11.4.2
--- php-src/ext/xsl/config.m4:1.11.4.1 Fri Sep 8 16:41:01 2006
+++ php-src/ext/xsl/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.11.4.1 2006/09/08 16:41:01 bjori Exp $
+dnl $Id: config.m4,v 1.11.4.2 2007/07/03 17:25:35 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.2&r2=1.8.2.3&diff_format=u
Index: php-src/ext/zip/config.m4
diff -u php-src/ext/zip/config.m4:1.8.2.2 php-src/ext/zip/config.m4:1.8.2.3
--- php-src/ext/zip/config.m4:1.8.2.2 Tue Dec 26 09:52:05 2006
+++ php-src/ext/zip/config.m4 Tue Jul 3 17:25:35 2007
@@ -1,13 +1,13 @@
dnl
-dnl $Id: config.m4,v 1.8.2.2 2006/12/26 09:52:05 pajoye Exp $
+dnl $Id: config.m4,v 1.8.2.3 2007/07/03 17:25:35 sniper Exp $
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
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.17.2.2.2.4&r2=1.17.2.2.2.5&diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.17.2.2.2.4
php-src/sapi/cgi/config9.m4:1.17.2.2.2.5
--- php-src/sapi/cgi/config9.m4:1.17.2.2.2.4 Thu May 24 23:29:59 2007
+++ php-src/sapi/cgi/config9.m4 Tue Jul 3 17:25:35 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.17.2.2.2.4 2007/05/24 23:29:59 sniper Exp $
+dnl $Id: config9.m4,v 1.17.2.2.2.5 2007/07/03 17:25:35 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -12,9 +12,8 @@
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(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(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
],[
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
