configure help message formatting

configure help message formatting

[Alan Modra]

configure --help formatting still isn't anywhere near perfect, but this
fixes some indentation problems in files controlled by binutils.

bfd/
	* warning.m4 (--enable-werror, -build-warnings): Format help messages.
	* configure: Regenerate.
binutils/
	* configure: Regenerate.
gas/
	* configure.in (--enable-targets): Indent help message.
	* configure: Regenerate.
gprof/
	* configure: Regenerate.
ld/
	* configure: Regenerate.
opcodes/
	* configure: Regenerate.

Index: bfd/warning.m4
===================================================================
RCS file: /cvs/src/src/bfd/warning.m4,v
retrieving revision 1.2
diff -u -p -r1.2 warning.m4
--- bfd/warning.m4	7 Nov 2005 22:14:12 -0000	1.2
+++ bfd/warning.m4	18 Apr 2006 14:25:44 -0000
@@ -4,7 +4,7 @@ AC_DEFUN([AM_BINUTILS_WARNINGS],[
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 
 AC_ARG_ENABLE(werror,
-  [  --enable-werror    treat compile warnings as errors],
+  [  --enable-werror         treat compile warnings as errors],
   [case "${enableval}" in
      yes | y) ERROR_ON_WARNING="yes" ;;
      no | n)  ERROR_ON_WARNING="no" ;;
@@ -27,7 +27,7 @@ if test "${GCC}" = yes ; then
 fi
 
 AC_ARG_ENABLE(build-warnings,
-[  --enable-build-warnings Enable build-time compiler warnings],
+[  --enable-build-warnings enable build-time compiler warnings],
 [case "${enableval}" in
   yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
   no)	if test "${GCC}" = yes ; then
Index: gas/configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.188
diff -u -p -r1.188 configure.in
--- gas/configure.in	6 Apr 2006 21:49:33 -0000	1.188
+++ gas/configure.in	18 Apr 2006 14:26:04 -0000
@@ -23,7 +23,7 @@ AM_INIT_AUTOMAKE(gas, ${BFD_VERSION})
 AM_PROG_LIBTOOL
 
 AC_ARG_ENABLE(targets,
-[   --enable-targets       alternative target configurations besides the primary],
+[  --enable-targets        alternative target configurations besides the primary],
 [case "${enableval}" in
   yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
 	    ;;

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre

Re: configure help message formatting

[Bernd Jendrissek]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message

On Wed, Apr 19, 2006 at 11:24:33AM +0930, Alan Modra wrote:
> configure --help formatting still isn't anywhere near perfect, but this
> fixes some indentation problems in files controlled by binutils.
> 
> bfd/
> 	* warning.m4 (--enable-werror, -build-warnings): Format help messages.
> 	* configure: Regenerate.
> binutils/
> 	* configure: Regenerate.
> gas/
> 	* configure.in (--enable-targets): Indent help message.
> 	* configure: Regenerate.
> gprof/
> 	* configure: Regenerate.
> ld/
> 	* configure: Regenerate.
> opcodes/
> 	* configure: Regenerate.

Aren't these ./configuren generated by autoconf 2.5x?  Couldn't you have
just used AS_HELP_STRING([--enable-werror], [treat compile ...]) and let
it get the indentation right, or what am I forgetting?

[Warning: hand-hacked patch follows, apply with care on top of yours]

diff -u -p -r1.2 warning.m4
--- bfd/warning.m4	7 Nov 2005 22:14:12 -0000	1.2
+++ bfd/warning.m4	18 Apr 2006 14:25:44 -0000
@@ -4,7 +4,7 @@ AC_DEFUN([AM_BINUTILS_WARNINGS],[
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 
 AC_ARG_ENABLE(werror,
-  [  --enable-werror         treat compile warnings as errors],
+  AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]),
   [case "${enableval}" in
      yes | y) ERROR_ON_WARNING="yes" ;;
      no | n)  ERROR_ON_WARNING="no" ;;
@@ -27,7 +27,8 @@ if test "${GCC}" = yes ; then
 fi
 
 AC_ARG_ENABLE(build-warnings,
-[  --enable-build-warnings enable build-time compiler warnings],
+AS_HELP_STRING([--enable-build-warnings],
+               [enable build-time compiler warnings]),
 [case "${enableval}" in
   yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
   no)	if test "${GCC}" = yes ; then
diff -u -p -r1.188 configure.in
--- gas/configure.in	6 Apr 2006 21:49:33 -0000	1.188
+++ gas/configure.in	18 Apr 2006 14:26:04 -0000
@@ -23,7 +23,8 @@ AM_INIT_AUTOMAKE(gas, ${BFD_VERSION})
 AM_PROG_LIBTOOL
 
 AC_ARG_ENABLE(targets,
-[  --enable-targets        alternative target configurations besides the primary],
+AS_HELP_STRING([--enable-targets],
+               [alternative target configurations besides the primary]),
 [case "${enableval}" in
   yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
 	    ;;

-- 
A PC without Windows is like ice cream without ketchup.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Please fetch my new key 804177F8 from hkp://wwwkeys.eu.pgp.net/

iD8DBQFERelFwyMv24BBd/gRAqEyAJ9gAUPN3/8gFQTGokIRJ2OiVET9gQCggLk1
4jRBPiboW3XAILTuq7AW6yo=
=d6W4
-----END PGP SIGNATURE-----

Re: configure help message formatting

[Alan Modra]

On Wed, Apr 19, 2006 at 09:40:03AM +0200, Bernd Jendrissek wrote:
> Aren't these ./configuren generated by autoconf 2.5x?  Couldn't you have
> just used AS_HELP_STRING([--enable-werror], [treat compile ...]) and let
> it get the indentation right, or what am I forgetting?

I didn't know about AS_HELP_STRING.  It would be a good idea to use it,
ideally in conjuction with patches for gcc so that all strings are
nicely formatted.  Do you feel like submitting a patch?  :-)

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre