From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 9 Sep 2010 15:24:13 +0000 (+0200)
Subject: Use AS_HELP_STRING in AM_SILENT_RULES.
X-Git-Tag: ng-0.5a~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d76d91ae1b12c4730dc897cdb25a1d41af499ac0;p=thirdparty%2Fautomake.git

Use AS_HELP_STRING in AM_SILENT_RULES.

* m4/silent.m4 (AM_SILENT_RULES): Use `AS_HELP_STRING' to format
help message regarding configure options `--enable-silent-rules'
and `--disable-silent-rules'.  Also throw in a couple of cosmetic
changes in the related `case' statement (indentation, balancing
of parentheses).
* THANKS: Update.

From a report by Jeff A. Daily.
---

diff --git a/ChangeLog b/ChangeLog
index 6b1b6db8e..0db0574e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	Use AS_HELP_STRING in AM_SILENT_RULES.
+	* m4/silent.m4 (AM_SILENT_RULES): Use `AS_HELP_STRING' to format
+	help message regarding configure options `--enable-silent-rules'
+	and `--disable-silent-rules'.  Also throw in a couple of cosmetic
+	changes in the related `case' statement (indentation, balancing
+	of parentheses).
+	* THANKS: Update.
+	From a report by Jeff A. Daily.
+
 2010-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	Make some `confh*.test' tests more "semantic" (plus tweakings).
diff --git a/THANKS b/THANKS
index 810a7000d..2cdf1ee36 100644
--- a/THANKS
+++ b/THANKS
@@ -146,6 +146,7 @@ Jared Davis		abiword@aiksaurus.com
 Jason Duell		jcduell@lbl.gov
 Jason Molenda		crash@cygnus.co.jp
 Jeff Bailey		Jbailey@phn.ca
+Jeff A. Daily		jeff.daily@pnl.gov
 Jeff Garzik		jgarzik@pobox.com
 Jeff Squyres		jsquyres@lam-mpi.org
 Jens Elkner		elkner@imsgroup.de
diff --git a/configure b/configure
index b7f3e9bdb..dafdbce4e 100755
--- a/configure
+++ b/configure
@@ -1268,8 +1268,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-silent-rules   less verbose build output (undo: `make V=1')
+  --disable-silent-rules  verbose build output (undo: `make V=0')
 
 Report bugs to <bug-automake@gnu.org>.
 GNU Automake home page: <http://www.gnu.org/software/automake/>.
@@ -2207,10 +2207,10 @@ if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
 esac
 AM_BACKSLASH='\'
 
diff --git a/m4/silent.m4 b/m4/silent.m4
index 6d2a1a276..432dd4577 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -1,24 +1,29 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
 # (`yes' being less verbose, `no' or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: `make V=1')])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: `make V=0')])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'