sniper Tue Jul 3 17:24:37 2007 UTC Modified files: /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/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_oci config.m4 /php-src/ext/pdo_sqlite 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 Log: - Fix some configure --help texts
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.630&r2=1.631&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.630 php-src/configure.in:1.631 --- php-src/configure.in:1.630 Fri Jun 29 01:09:53 2007 +++ php-src/configure.in Tue Jul 3 17:24:36 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.630 2007/06/29 01:09:53 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.631 2007/07/03 17:24:36 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -719,8 +719,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.21&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.21 --- 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:24:36 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.21 2007/07/03 17:24:36 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.173&r2=1.174&diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.173 php-src/ext/gd/config.m4:1.174 --- php-src/ext/gd/config.m4:1.173 Fri Jun 1 21:33:30 2007 +++ php-src/ext/gd/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.173 2007/06/01 21:33:30 sniper Exp $ +dnl $Id: config.m4,v 1.174 2007/07/03 17:24:36 sniper Exp $ dnl dnl @@ -7,8 +7,8 @@ dnl PHP_ARG_WITH(gd, for GD support, -[ --with-gd[=FILE] Include GD support. FILE is the optional pathname to gdlib-config. - If FILE is not set, the bundled GD library will be used]) +[ --with-gd[=FILE] Include GD support. FILE is the optional + pathname to gdlib-config [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.11&r2=1.12&diff_format=u Index: php-src/ext/hash/config.m4 diff -u php-src/ext/hash/config.m4:1.11 php-src/ext/hash/config.m4:1.12 --- php-src/ext/hash/config.m4:1.11 Sun Feb 19 23:43:23 2006 +++ php-src/ext/hash/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.11 2006/02/19 23:43:23 mike Exp $ +dnl $Id: config.m4,v 1.12 2007/07/03 17:24:36 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.21&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.21 --- 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:24:36 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.21 2007/07/03 17:24:36 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.6&r2=1.7&diff_format=u Index: php-src/ext/json/config.m4 diff -u php-src/ext/json/config.m4:1.6 php-src/ext/json/config.m4:1.7 --- php-src/ext/json/config.m4:1.6 Thu Jul 20 10:47:26 2006 +++ php-src/ext/json/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.6 2006/07/20 10:47:26 tony2001 Exp $ +dnl $Id: config.m4,v 1.7 2007/07/03 17:24:36 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.4&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.4 --- 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:24:36 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.4 2007/07/03 17:24:36 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/mime_magic/config.m4?r1=1.12&r2=1.13&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.13 --- 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:24:36 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.13 2007/07/03 17:24:36 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.15&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.15 --- 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:24:36 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.15 2007/07/03 17:24:36 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.12&r2=1.13&diff_format=u Index: php-src/ext/mssql/config.m4 diff -u php-src/ext/mssql/config.m4:1.12 php-src/ext/mssql/config.m4:1.13 --- php-src/ext/mssql/config.m4:1.12 Mon Oct 10 10:28:21 2005 +++ php-src/ext/mssql/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.12 2005/10/10 10:28:21 sniper Exp $ +dnl $Id: config.m4,v 1.13 2007/07/03 17:24:36 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.25&r2=1.26&diff_format=u Index: php-src/ext/mysqli/config.m4 diff -u php-src/ext/mysqli/config.m4:1.25 php-src/ext/mysqli/config.m4:1.26 --- php-src/ext/mysqli/config.m4:1.25 Mon Oct 9 04:46:03 2006 +++ php-src/ext/mysqli/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.25 2006/10/09 04:46:03 georg Exp $ +dnl $Id: config.m4,v 1.26 2007/07/03 17:24:37 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.65&r2=1.66&diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.65 php-src/ext/oci8/config.m4:1.66 --- php-src/ext/oci8/config.m4:1.65 Fri May 4 11:30:27 2007 +++ php-src/ext/oci8/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.65 2007/05/04 11:30:27 tony2001 Exp $ +dnl $Id: config.m4,v 1.66 2007/07/03 17:24:37 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.79&r2=1.80&diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.79 php-src/ext/odbc/config.m4:1.80 --- php-src/ext/odbc/config.m4:1.79 Tue Jan 10 14:15:12 2006 +++ php-src/ext/odbc/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.79 2006/01/10 14:15:12 tony2001 Exp $ +dnl $Id: config.m4,v 1.80 2007/07/03 17:24:37 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.47&r2=1.48&diff_format=u Index: php-src/ext/pcre/config0.m4 diff -u php-src/ext/pcre/config0.m4:1.47 php-src/ext/pcre/config0.m4:1.48 --- php-src/ext/pcre/config0.m4:1.47 Mon May 7 15:22:09 2007 +++ php-src/ext/pcre/config0.m4 Tue Jul 3 17:24:37 2007 @@ -1,15 +1,13 @@ dnl -dnl $Id: config0.m4,v 1.47 2007/05/07 15:22:09 nlopess Exp $ +dnl $Id: config0.m4,v 1.48 2007/07/03 17:24:37 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.4&r2=1.5&diff_format=u Index: php-src/ext/pdo_dblib/config.m4 diff -u php-src/ext/pdo_dblib/config.m4:1.4 php-src/ext/pdo_dblib/config.m4:1.5 --- php-src/ext/pdo_dblib/config.m4:1.4 Thu Nov 10 08:02:21 2005 +++ php-src/ext/pdo_dblib/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,11 +1,11 @@ dnl -dnl $Id: config.m4,v 1.4 2005/11/10 08:02:21 sniper Exp $ +dnl $Id: config.m4,v 1.5 2007/07/03 17:24:37 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.9&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.9 --- 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:24:37 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.9 2007/07/03 17:24:37 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_oci/config.m4?r1=1.17&r2=1.18&diff_format=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.17 php-src/ext/pdo_oci/config.m4:1.18 --- php-src/ext/pdo_oci/config.m4:1.17 Fri Jan 6 11:48:03 2006 +++ php-src/ext/pdo_oci/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 2006/01/06 11:48:03 tony2001 Exp $ +dnl $Id: config.m4,v 1.18 2007/07/03 17:24:37 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.34&r2=1.35&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.34 php-src/ext/pdo_sqlite/config.m4:1.35 --- php-src/ext/pdo_sqlite/config.m4:1.34 Mon Jun 25 16:26:19 2007 +++ php-src/ext/pdo_sqlite/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,11 +1,14 @@ -dnl $Id: config.m4,v 1.34 2007/06/25 16:26:19 sniper Exp $ +dnl $Id: config.m4,v 1.35 2007/07/03 17:24:37 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 driver for PDO, -[ --without-pdo-sqlite PDO: sqlite 3 support],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/sqlite/config.m4?r1=1.43&r2=1.44&diff_format=u Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.43 php-src/ext/sqlite/config.m4:1.44 --- php-src/ext/sqlite/config.m4:1.43 Thu Apr 19 06:42:57 2007 +++ php-src/ext/sqlite/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,12 +1,10 @@ -dnl $Id: config.m4,v 1.43 2007/04/19 06:42:57 sas Exp $ +dnl $Id: config.m4,v 1.44 2007/07/03 17:24:37 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 disable UTF-8 support in libsqlite (charset changes to ISO-8859-1), [ --disable-sqlite-utf8 SQLite: Disable UTF-8 support for SQLite (use ISO8859)], yes, no) http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/config.m4?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/sybase/config.m4 diff -u php-src/ext/sybase/config.m4:1.12 php-src/ext/sybase/config.m4:1.13 --- php-src/ext/sybase/config.m4:1.12 Wed Aug 31 22:29:22 2005 +++ php-src/ext/sybase/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.12 2005/08/31 22:29:22 sniper Exp $ +dnl $Id: config.m4,v 1.13 2007/07/03 17:24:37 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.16&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.16 --- 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:24:37 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.16 2007/07/03 17:24:37 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.12&r2=1.13&diff_format=u Index: php-src/ext/xsl/config.m4 diff -u php-src/ext/xsl/config.m4:1.12 php-src/ext/xsl/config.m4:1.13 --- php-src/ext/xsl/config.m4:1.12 Fri Sep 8 16:51:32 2006 +++ php-src/ext/xsl/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.12 2006/09/08 16:51:32 bjori Exp $ +dnl $Id: config.m4,v 1.13 2007/07/03 17:24:37 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.10&r2=1.11&diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.10 php-src/ext/zip/config.m4:1.11 --- php-src/ext/zip/config.m4:1.10 Tue Dec 26 09:52:32 2006 +++ php-src/ext/zip/config.m4 Tue Jul 3 17:24:37 2007 @@ -1,13 +1,13 @@ dnl -dnl $Id: config.m4,v 1.10 2006/12/26 09:52:32 pajoye Exp $ +dnl $Id: config.m4,v 1.11 2007/07/03 17:24:37 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php