cvs: /php4 configure.in.in /php4/ext/gd config.m4 /php4/ext/imap config.m4 /php4/ext/odbc config.m4 /php4/ext/pcre config.m4 /php4/ext/session
session.c

sas Thu Sep 16 11:35:50 1999 EDT Modified files: /php4 configure.in.in /php4/ext/gd config.m4 /php4/ext/imap config.m4 /php4/ext/odbc config.m4 /php4/ext/pcre config.m4 /php4/ext/session session.c Log: improve short help messages Index: php4/configure.in.in diff -u php4/configure.in.in:1.81 php4/configure.in.in:1.82 --- php4/configure.in.in:1.81 Thu Sep 16 10:07:56 1999 +++ php4/configure.in.in Thu Sep 16 11:35:46 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.81 1999/09/16 14:07:56 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.82 1999/09/16 15:35:46 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -391,8 +391,8 @@ versioning="no" AC_MSG_CHECKING(whether to enable versioning) AC_ARG_ENABLE(versioning, -[ --enable-versioning Take advantage of versioning and scoping - Provided by Solaris 2.x and Linux], +[ --enable-versioning Take advantage of versioning and scoping. + See INSTALL for more information], [ if test "$enableval" = "yes" ; then case "uname -sr" in @@ -630,7 +630,8 @@ AC_MSG_CHECKING(whether to use a configuration file) AC_ARG_WITH(config-file-path, -[ --with-config-file-path=PATH Sets the path in which to look for php.ini +[ --with-config-file-path=PATH + Sets the path in which to look for php.ini. defaults to /usr/local/lib], [ if test "$withval" = "yes"; then @@ -789,9 +790,10 @@ if test "$BINNAME" = "php"; then AC_MSG_CHECKING(whether to force Apache CGI redirect) AC_ARG_ENABLE(force-cgi-redirect, -[ --enable-force-cgi-redirect Enable the security check for internal server - redirects. You should use this if you are - running the CGI version with Apache. ], +[ --enable-force-cgi-redirect + Enable the security check for internal server + redirects. You should use this if you are + running the CGI version with Apache. ], [ if test "$enableval" = "yes"; then AC_DEFINE(FORCE_CGI_REDIRECT, 1) @@ -849,8 +851,9 @@ AC_MSG_CHECKING(whether to enable the URL-aware fopen wrapper) AC_ARG_ENABLE(url-fopen-wrapper, -[ --disable-url-fopen-wrapper Disable the URL-aware fopen wrapper that allows - accessing files via http or ftp.], +[ --disable-url-fopen-wrapper + Disable the URL-aware fopen wrapper that allows + accessing files via http or ftp.], [ if test "$enableval" = "yes"; then AC_DEFINE(PHP3_URL_FOPEN, 1) Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.8 php4/ext/gd/config.m4:1.9 --- php4/ext/gd/config.m4:1.8 Mon Sep 6 12:50:11 1999 +++ php4/ext/gd/config.m4 Thu Sep 16 11:35:47 1999 @@ -135,7 +135,8 @@ AC_MSG_CHECKING(whether to enable 4bit antialias hack with FreeType2) AC_ARG_ENABLE(freetype-4bit-antialias-hack, - [ --enable-freetype-4bit-antialias-hack For the crazy with FreeType2.],[ + [ --enable-freetype-4bit-antialias-hack + Include support for FreeType2 (experimental).],[ if test "$enableval" = "yes" ; then AC_DEFINE(FREETYPE_4BIT_ANTIALIAS_HACK, 1) AC_MSG_RESULT(yes) Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.7 php4/ext/imap/config.m4:1.8 --- php4/ext/imap/config.m4:1.7 Wed Jul 21 10:43:12 1999 +++ php4/ext/imap/config.m4 Thu Sep 16 11:35:48 1999 @@ -1,8 +1,9 @@ -dnl $Id: config.m4,v 1.7 1999/07/21 14:43:12 ssb Exp $ +dnl $Id: config.m4,v 1.8 1999/09/16 15:35:48 sas Exp $ AC_MSG_CHECKING(for IMAP support) AC_ARG_WITH(imap, -[ --with-imap[=DIR] Include IMAP support (DIR is the IMAP include dir and c-client.a dir).], +[ --with-imap[=DIR] Include IMAP support. DIR is the IMAP include + and c-client.a directory.], [ if test "$withval" = "yes"; then if test -f /usr/local/include/mail.h; then Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.4 php4/ext/odbc/config.m4:1.5 --- php4/ext/odbc/config.m4:1.4 Mon Aug 30 06:48:23 1999 +++ php4/ext/odbc/config.m4 Thu Sep 16 11:35:49 1999 @@ -131,8 +131,8 @@ if test -z "$ODBC_TYPE"; then AC_MSG_CHECKING(for Velocis support) AC_ARG_WITH(velocis, -[ --with-velocis[=DIR] Include Velocis support. DIR is the Velocis - base install directory, defaults to /usr/local/velocis.], +[ --with-velocis[=DIR] Include Velocis support. DIR is the Velocis base + install directory, defaults to /usr/local/velocis.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then @@ -164,7 +164,8 @@ 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. +[ --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 Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.10 php4/ext/pcre/config.m4:1.11 --- php4/ext/pcre/config.m4:1.10 Tue Sep 14 15:24:37 1999 +++ php4/ext/pcre/config.m4 Thu Sep 16 11:35:49 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 1999/09/14 19:24:37 andrey Exp $ +dnl $Id: config.m4,v 1.11 1999/09/16 15:35:49 sas Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -6,9 +6,10 @@ AC_MSG_CHECKING(whether to include PCRE support) AC_ARG_WITH(pcre-regex, -[ --without-pcre-regex Don't include Perl Compatible Regular Expressions support - Use --with-pcre-regex=DIR to specify DIR where PCRE include - and library files are located],[ +[ --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], +[ case "$withval" in no) AC_MSG_RESULT(no) Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.50 php4/ext/session/session.c:1.51 --- php4/ext/session/session.c:1.50 Thu Sep 16 08:55:31 1999 +++ php4/ext/session/session.c Thu Sep 16 11:35:49 1999 @@ -183,8 +183,9 @@ if(p[0] == '!') { p++; has_value = 0; - } else + } else { has_value = 1; + } namelen = q - p; name = estrndup(p, namelen);