tweaking "configure --help" for autoconf changes

Hi Folks: There's a minor difference between the output of "configure --help" between PHP_5_3 and PHP_5_4. The change makes it hard to tell what the default values are for some options. The options impacted are those defined in configure.in using PHP_ARG_WITH. A simple example is --with-layout Here's the string in configure.in: Type can be either PHP or GNU [PHP] Here's the output in PHP_5_2 and PHP_5_3: Type can be either PHP or GNU [PHP] But here is the output from PHP_5_4: Type can be either PHP or GNU PHP This is an offshoot of the move from autoconf 2.13 to 2.65. I've attached a patch for 5.4 and trunk to use autoconf "quadragraph"[1] representations of brackets instead of the brackets themselves. Can someone please apply this? Thanks, --Dan [1] http://www.gnu.org/s/hello/manual/autoconf/Quadrigraphs.html -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 f: 718-854-0409

Index: branches/PHP_5_4/configure.in =================================================================== --- branches/PHP_5_4/configure.in (revision 320167) +++ branches/PHP_5_4/configure.in (working copy) @@ -863,7 +863,7 @@ PHP_ARG_WITH(layout, layout of installed files, [ --with-layout=TYPE Set how installed files will be laid out. Type can - be either PHP or GNU [PHP]], PHP, no) + be either PHP or GNU @<:@PHP@:>@], PHP, no) case $PHP_LAYOUT in GNU) @@ -876,7 +876,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 @@ -1068,7 +1068,7 @@ fi PHP_ARG_WITH(pear, [whether to install PEAR], -[ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] +[ --with-pear=DIR Install PEAR in DIR @<:@PREFIX/lib/php@:>@ --without-pear Do not install PEAR], DEFAULT, yes) if test "$PHP_PEAR" != "no"; then Index: trunk/configure.in =================================================================== --- trunk/configure.in (revision 320174) +++ trunk/configure.in (working copy) @@ -863,7 +863,7 @@ PHP_ARG_WITH(layout, layout of installed files, [ --with-layout=TYPE Set how installed files will be laid out. Type can - be either PHP or GNU [PHP]], PHP, no) + be either PHP or GNU @<:@PHP@:>@], PHP, no) case $PHP_LAYOUT in GNU) @@ -876,7 +876,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 @@ -1068,7 +1068,7 @@ fi PHP_ARG_WITH(pear, [whether to install PEAR], -[ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] +[ --with-pear=DIR Install PEAR in DIR @<:@PREFIX/lib/php@:>@ --without-pear Do not install PEAR], DEFAULT, yes) if test "$PHP_PEAR" != "no"; then