From: Akim Demaille Date: Tue, 12 Nov 2002 10:54:44 +0000 (+0000) Subject: * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Add -q X-Git-Tag: AUTOCONF-2.55~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77f69ee45ee95a27999fdebd5dcf80de3661d314;p=thirdparty%2Fautoconf.git * 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. --- diff --git a/ChangeLog b/ChangeLog index 296ac4c30..a06dc58ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-11-12 Peter Eisentraut + + * 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. + 2002-11-07 Alexandre Duret-Lutz * bin/autoscan.in (scan_file): Scan Makefile.am too. Ignore diff --git a/NEWS b/NEWS index 87f2eeb8e..1b0485f02 100644 --- a/NEWS +++ b/NEWS @@ -41,6 +41,9 @@ Release tips: - ~/.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 diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 2a1a91bf8..f4135b870 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -12052,6 +12052,11 @@ files, and exit. @itemx -V Print the version number of Autoconf and exit. +@item --silent +@itemx --quiet +@itemx -q +Do not print progress messages. + @item --debug @itemx -d Don't remove the temporary files. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 6d2dd84a0..2dc8396b7 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1134,6 +1134,7 @@ m4_define([_AC_INIT_PREPARE], # 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 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. [ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)] diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index bf322339a..77adefaf0 100644 --- a/lib/autoconf/status.m4 +++ b/lib/autoconf/status.m4 @@ -1250,8 +1250,11 @@ AC_OUTPUT_COMMANDS_POST()dnl # 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. @@ -1277,6 +1280,8 @@ cat >$CONFIG_STATUS <<_ACEOF # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -1340,6 +1345,7 @@ Usage: $[0] [[OPTIONS]] [[FILE]]... -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 @@ do 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) @@ -1443,6 +1446,9 @@ Try `$[0] --help' for more information.]);; $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] @@ -1454,6 +1460,20 @@ Try `$[0] --help' for more information.]) ;; 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 dnl We output the INIT-CMDS first for obvious reasons :)