* configure: Rebuild.

	* acinclude.m4 (AM_ICONV): Use AC_HELP_STRING.
	* configure.ac: Use AC_HELP_STRING.  Use upper case for variables
	in help.

4 files changed, 44 insertions, 31 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2cf98d11641..d93e1c594bb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* configure: Rebuild.
+	* acinclude.m4 (AM_ICONV): Use AC_HELP_STRING.
+	* configure.ac: Use AC_HELP_STRING.  Use upper case for variables
+	in help.
+
 2009-04-21  Pierre Muller  <muller.u-strasbg.fr>
 
 	ARI fix: remove "%p".
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 5e77230d7bf..ab58112112c 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -175,7 +175,7 @@ AC_DEFUN([AM_ICONV],
   dnl those with the standalone portable GNU libiconv installed).
 
   AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    AC_HELP_STRING([--with-libiconv-prefix=DIR], [search for libiconv in DIR/include and DIR/lib]), [
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then LIBICONV_INCLUDE="-I$dir/include"; fi
       if test -d $dir/lib; then LIBICONV_LIBDIR="-L$dir/lib"; fi
diff --git a/gdb/configure b/gdb/configure
index d37c4f2eb93..30414d09197 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -864,7 +864,8 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-targets        alternative target configurations
+  --enable-targets=TARGETS
+                          alternative target configurations
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
   --disable-gdbcli        disable command-line interface (CLI)
   --disable-gdbmi         disable machine-interface (MI)
@@ -872,35 +873,42 @@ Optional Features:
   --enable-gdbtk          enable gdbtk graphical user interface (GUI)
   --enable-profiling      enable profiling of GDB
   --disable-rpath         do not hardcode runtime library paths
-  --enable-werror    treat compile warnings as errors
+  --enable-werror         treat compile warnings as errors
   --enable-build-warnings Enable build-time compiler warnings if gcc is used
-  --enable-gdb-build-warnings Enable GDB specific build-time compiler warnings if gcc is used
+  --enable-gdb-build-warnings
+                          Enable GDB specific build-time compiler warnings if
+                          gcc is used
   --enable-sim            Link gdb with simulator
   --enable-multi-ice      build the multi-ice-gdb-server
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-separate-debug-dir=path   Look for global separate debug info in this path LIBDIR/debug
+  --with-separate-debug-dir=PATH
+                          Look for global separate debug info in this path
+                          LIBDIR/debug
   --with-relocated-sources=PATH
                           Automatically relocate this path for source files
-  --with-libunwind            Use libunwind frame unwinding support
+  --with-libunwind        Use libunwind frame unwinding support
   --with-curses           use the curses library instead of the termcap
                           library
   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
   --with-bugurl=URL       Direct users to URL to report a bug
-  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
+  --with-libiconv-prefix=DIR
+                          search for libiconv in DIR/include and DIR/lib
   --with-system-readline  use installed readline library
   --with-expat            include expat support (auto/yes/no)
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libexpat-prefix[=DIR]  search for libexpat in DIR/include and DIR/lib
   --without-libexpat-prefix     don't search for libexpat in includedir and libdir
   --with-python           include python support (auto/yes/no/<path>)
-  --without-included-regex don't use included regex; this is the default
-                          on systems with version 2 of the GNU C library
-                          (use with caution on other system)
-  --with-sysroot=DIR Search for usr/lib et al within DIR.
-  --with-system-gdbinit=file       Automatically load a system-wide gdbinit file
+  --without-included-regex
+                          don't use included regex; this is the default on
+                          systems with version 2 of the GNU C library (use
+                          with caution on other system)
+  --with-sysroot=DIR    Search for usr/lib et al within DIR.
+  --with-system-gdbinit=FILE
+                          Automatically load a system-wide gdbinit file
   --with-tcl              directory containing tcl configuration (tclConfig.sh)
   --with-tk               directory containing tk configuration (tkConfig.sh)
   --with-x                use the X Window System
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 68c8e4a2a07..ccea13e4df6 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -95,7 +95,7 @@ AM_INIT_AUTOMAKE(gdb, UNUSED-VERSION, [no-define])
 debugdir=${libdir}/debug
 	 
 AC_ARG_WITH(separate-debug-dir,
-[  --with-separate-debug-dir=path   Look for global separate debug info in this path [LIBDIR/debug]],
+AC_HELP_STRING([--with-separate-debug-dir=PATH], [Look for global separate debug info in this path [LIBDIR/debug]]),
 [debugdir="${withval}"])
 	
 AC_DEFINE_DIR(DEBUGDIR, debugdir,
@@ -129,7 +129,7 @@ AC_CONFIG_SUBDIRS(doc testsuite)
 
 # Check whether to support alternative target configurations
 AC_ARG_ENABLE(targets,
-[  --enable-targets        alternative target configurations],
+AC_HELP_STRING([--enable-targets=TARGETS], [alternative target configurations]),
 [case "${enableval}" in
   yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
             ;;
@@ -139,7 +139,7 @@ esac])
 
 # Check whether to enable 64-bit support on 32-bit hosts
 AC_ARG_ENABLE(64-bit-bfd,
-[  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
+AC_HELP_STRING([--enable-64-bit-bfd], [64-bit support (on hosts with narrower word sizes)]),
 [case "${enableval}" in
   yes)  want64=true  ;;
   no)   want64=false ;;
@@ -247,7 +247,7 @@ fi
 
 # Enable CLI.
 AC_ARG_ENABLE(gdbcli,
-[  --disable-gdbcli        disable command-line interface (CLI)],
+AC_HELP_STRING([--disable-gdbcli], [disable command-line interface (CLI)]),
   [case $enableval in
     yes)
       ;;
@@ -268,7 +268,7 @@ fi
 
 # Enable MI.
 AC_ARG_ENABLE(gdbmi,
-[  --disable-gdbmi         disable machine-interface (MI)],
+AC_HELP_STRING([--disable-gdbmi], [disable machine-interface (MI)]),
   [case $enableval in
     yes | no)
       ;;
@@ -287,7 +287,7 @@ fi
 
 # Enable TUI.
 AC_ARG_ENABLE(tui,
-[  --enable-tui            enable full-screen terminal user interface (TUI)],
+AC_HELP_STRING([--enable-tui], [enable full-screen terminal user interface (TUI)]),
   [case $enableval in
     yes | no | auto)
       ;;
@@ -297,7 +297,7 @@ AC_ARG_ENABLE(tui,
 
 # Enable gdbtk.
 AC_ARG_ENABLE(gdbtk,
-[  --enable-gdbtk          enable gdbtk graphical user interface (GUI)],
+AC_HELP_STRING([--enable-gdbtk], [enable gdbtk graphical user interface (GUI)]),
   [case $enableval in
     yes | no)
       ;;
@@ -318,7 +318,7 @@ esac
 
 # Libunwind support.
 AC_ARG_WITH(libunwind,
-[  --with-libunwind            Use libunwind frame unwinding support],
+AC_HELP_STRING([--with-libunwind], [Use libunwind frame unwinding support]),
 [case "${withval}" in
   yes)  enable_libunwind=yes ;;
   no)   enable_libunwind=no ;;
@@ -348,7 +348,7 @@ fi
 
 # Profiling support.
 AC_ARG_ENABLE(profiling,
-[  --enable-profiling      enable profiling of GDB],
+AC_HELP_STRING([--enable-profiling], [enable profiling of GDB]),
   [case $enableval in
     yes | no)
       ;;
@@ -927,9 +927,7 @@ if test $gdb_cv_have_gnu_regex = yes; then
 fi
 
 AC_ARG_WITH(included-regex,
-  [  --without-included-regex don't use included regex; this is the default
-                          on systems with version 2 of the GNU C library
-                          (use with caution on other system)],
+  AC_HELP_STRING([--without-included-regex], [don't use included regex; this is the default on systems with version 2 of the GNU C library (use with caution on other system)]),
   gdb_with_regex=$withval,
   gdb_with_regex=$gdb_use_included_regex)
 if test "$gdb_with_regex" = yes; then
@@ -1482,7 +1480,7 @@ fi
 dnl Handle optional features that can be enabled.
 
 AC_ARG_WITH(sysroot,
-[  --with-sysroot[=DIR] Search for usr/lib et al within DIR.],
+AC_HELP_STRING([--with-sysroot[=DIR]], [Search for usr/lib et al within DIR.]),
 [
  case ${with_sysroot} in
  yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_alias}/sys-root' ;;
@@ -1519,7 +1517,7 @@ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
 
 system_gdbinit=
 AC_ARG_WITH(system-gdbinit,
-[  --with-system-gdbinit=file       Automatically load a system-wide gdbinit file],
+AC_HELP_STRING([--with-system-gdbinit=FILE], [Automatically load a system-wide gdbinit file]),
 [system_gdbinit=${withval}])
 
 AC_DEFINE_DIR(SYSTEM_GDBINIT, system_gdbinit,
@@ -1546,7 +1544,7 @@ case ${system_gdbinit} in
 esac
 
 AC_ARG_ENABLE(werror,
-  [  --enable-werror    treat compile warnings as errors],
+  AC_HELP_STRING([--enable-werror], [treat compile warnings as errors]),
   [case "${enableval}" in
      yes | y) ERROR_ON_WARNING="yes" ;;
      no | n)  ERROR_ON_WARNING="no" ;;
@@ -1579,7 +1577,7 @@ case "${host}" in
 esac
 
 AC_ARG_ENABLE(build-warnings,
-[  --enable-build-warnings Enable build-time compiler warnings if gcc is used],
+AC_HELP_STRING([--enable-build-warnings], [Enable build-time compiler warnings if gcc is used]),
 [case "${enableval}" in
   yes)	;;
   no)	build_warnings="-w";;
@@ -1593,7 +1591,7 @@ if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
   echo "Setting compiler warning flags = $build_warnings" 6>&1
 fi])dnl
 AC_ARG_ENABLE(gdb-build-warnings,
-[  --enable-gdb-build-warnings Enable GDB specific build-time compiler warnings if gcc is used],
+AC_HELP_STRING([--enable-gdb-build-warnings], [Enable GDB specific build-time compiler warnings if gcc is used]),
 [case "${enableval}" in
   yes)	;;
   no)	build_warnings="-w";;
@@ -1831,7 +1829,7 @@ AC_PATH_X
 # not part of the source tree.
 #
 AC_ARG_ENABLE(sim,
-[  --enable-sim            Link gdb with simulator],
+AC_HELP_STRING([--enable-sim], [Link gdb with simulator]),
 [echo "enable_sim = $enable_sim";
  echo "enableval = ${enableval}";
  case "${enableval}" in
@@ -1911,7 +1909,7 @@ fi
 
 # Enable multi-ice-gdb-server.
 AC_ARG_ENABLE(multi-ice,
-[  --enable-multi-ice      build the multi-ice-gdb-server],
+AC_HELP_STRING([--enable-multi-ice], [build the multi-ice-gdb-server]),
   [case $enableval in
     yes | no)
       ;;