Re: config.status -q patch

[Akim Demaille]

| 2002-11-10  Peter Eisentraut  <address@hidden>
| 
|       * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Add -q
|       option.  Process --recheck after parsing all options.  Pass -q
|       option to configure on --recheck.
|       (AC_OUTPUT): Pass -q from configure to config.status.
|       * lib/autoconf/general.m4 (_AC_INIT_PREPARE): Strip -q from
|       arguments to record.
|       * doc/autoconf.texi (config.status Invocation): Document
|       config.status -q option.

Thanks, installed, and NEWS'd.  Also, I moved people into the ac_cs_
name space.

Index: ChangeLog
from  Peter Eisentraut  <address@hidden>

        * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Add -q
        option.  Process --recheck after parsing all options.  Pass -q
        option to configure on --recheck.
        (AC_OUTPUT): Pass -q from configure to config.status.
        * lib/autoconf/general.m4 (_AC_INIT_PREPARE): Strip -q from
        arguments to record.
        * doc/autoconf.texi (config.status Invocation): Document
        config.status -q option.

Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.283
diff -u -u -r1.283 NEWS
--- NEWS 7 Nov 2002 14:28:57 -0000 1.283
+++ NEWS 12 Nov 2002 10:50:50 -0000
@@ -41,6 +41,9 @@
 - ~/.autom4te.cfg makes it possible to disable the caching mechanism
   (autom4te.cache).  See `Customizing autom4te' in the documentation.
 
+** config.status
+  Supports --quiet.
+
 ** Obsolete options
 
   Support for the obsoleted options -m, --macrodir, -l, --localdir is
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.712
diff -u -u -r1.712 autoconf.texi
--- doc/autoconf.texi 6 Nov 2002 10:29:21 -0000 1.712
+++ doc/autoconf.texi 12 Nov 2002 10:51:09 -0000
@@ -12052,6 +12052,11 @@
 @itemx -V
 Print the version number of Autoconf and exit.
 
address@hidden --silent
address@hidden --quiet
address@hidden -q
+Do not print progress messages.
+
 @item --debug
 @itemx -d
 Don't remove the temporary files.
Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.810
diff -u -u -r1.810 general.m4
--- lib/autoconf/general.m4 5 Nov 2002 20:28:08 -0000 1.810
+++ lib/autoconf/general.m4 12 Nov 2002 10:51:12 -0000
@@ -1134,6 +1134,7 @@
 
 # Keep a trace of the command line.
 # Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
 # Also quote any args containing shell meta-characters.
 # Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
@@ -1147,6 +1148,9 @@
   do
     case $ac_arg in
     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
 dnl If you change this globbing pattern, test it on an old shell --
 dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
   [  *" "*|*"  "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)]
Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.31
diff -u -u -r1.31 status.m4
--- lib/autoconf/status.m4 17 Oct 2002 10:34:11 -0000 1.31
+++ lib/autoconf/status.m4 12 Nov 2002 10:51:12 -0000
@@ -1250,8 +1250,11 @@
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
   exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec AS_MESSAGE_LOG_FD>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
@@ -1276,7 +1279,9 @@
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
-debug=false
+ac_cs_debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
@@ -1340,6 +1345,7 @@
 
   -h, --help       print this help, then exit
   -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
 m4_ifset([AC_LIST_FILES],
@@ -1419,12 +1425,9 @@
   case $ac_option in
   # Handling of the options.
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running $SHELL $[0] " $ac_configure_args " --no-create 
--no-recursion"
-    exec $SHELL $[0] $ac_configure_args --no-create --no-recursion ;;
-_ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
@@ -1434,7 +1437,7 @@
   --help | --hel | -h )
     echo "$ac_cs_usage"; exit 0 ;;
   --debug | --d* | -d )
-    debug=: ;;
+    ac_cs_debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
@@ -1443,6 +1446,9 @@
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
 
   # This is an error.
   -*) AC_MSG_ERROR([unrecognized option: $[1]
@@ -1453,6 +1459,20 @@
   esac
   shift
 done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+  echo "running $SHELL $[0] " $ac_configure_args \$ac_configure_extra_args " 
--no-create --no-recursion" >&AS_MESSAGE_FD
+  exec $SHELL $[0] $ac_configure_args \$ac_configure_extra_args --no-create 
--no-recursion
+fi
 
 _ACEOF