improve short help messages

7 files changed, 29 insertions, 20 deletions

diff --git a/configure.in.in b/configure.in.in
index 20dbcd7e0c..7dabb9f85a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -391,8 +391,8 @@ AC_ARG_WITH(apxs,
 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_SUBST(FHTTPD_TARGET)
 
 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 @@ dnl ])
 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_ARG_ENABLE(short-tags,
 
 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)
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index a3e6585b21..9b4b54ca7a 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -135,7 +135,8 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
 
   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)
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 36697bfc18..9eec8c0ad1 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -2,7 +2,8 @@ dnl $Id$
 
 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
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 6113438145..68fdd1be48 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -131,8 +131,8 @@ fi
 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 @@ 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.
+[  --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
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index 6137e59269..9ee60a9305 100644
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -6,9 +6,10 @@ dnl if DIR is supplied, we'll use that for linking
 
 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)
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 6137e59269..9ee60a9305 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -6,9 +6,10 @@ dnl if DIR is supplied, we'll use that for linking
 
 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)
diff --git a/ext/session/session.c b/ext/session/session.c
index 9b00f21604..0ba6636508 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -183,8 +183,9 @@ PS_SERIALIZER_DECODE_FUNC(php)
 		if(p[0] == '!') {
 			p++;
 			has_value = 0;
-		} else
+		} else {
 			has_value = 1;
+		}
 		
 		namelen = q - p;
 		name = estrndup(p, namelen);