From: Charles Wilson Date: Sat, 15 Nov 2008 09:40:26 +0000 (-0500) Subject: Fix --verbose option; add new --no-{silent|quiet|verbose} options. X-Git-Tag: v2.2.7b~168 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87cea4bf9e8341df8a317f8971fcccdad0cca9f3;p=thirdparty%2Flibtool.git Fix --verbose option; add new --no-{silent|quiet|verbose} options. * libltdl/config/ltmain.m4sh (usage): Document new options --no-silent/--no-quiet and --no-verbose. (func_enable_tag): Handle new options. Modified --verbose to actually activate opt_verbose. New behavior: --silent disables both "normal" output and func_verbose output. --verbose enables both "normal" output and func_verbose output. --no-silent enables "normal" output, but does not affect func_verbose output. --no-verbose disables func_verbose output, but does not affect "normal" output. * NEWS: announce new options --no-silent/--no-quiet, and --no-verbose. * doc/libtool.texi: document new options --no-silent/--no-quiet and --no-verbose. --- diff --git a/ChangeLog b/ChangeLog index b1582fdf1..cd1b1fa67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2008-11-21 Charles Wilson + + Fix --verbose option; add new --no-{silent|quiet|verbose} options. + + * libltdl/config/ltmain.m4sh (usage): Document + new options --no-silent/--no-quiet and --no-verbose. + (func_enable_tag): Handle new options. + Modified --verbose to actually activate opt_verbose. + New behavior: --silent disables both "normal" output and + func_verbose output. --verbose enables both "normal" + output and func_verbose output. --no-silent enables + "normal" output, but does not affect func_verbose output. + --no-verbose disables func_verbose output, but does not + affect "normal" output. + * NEWS: announce new options --no-silent/--no-quiet, and + --no-verbose. + * doc/libtool.texi: document new options --no-silent/--no-quiet + and --no-verbose. + 2008-11-20 Ralf Wildenhues Fix match patterns for cegcc*. diff --git a/NEWS b/NEWS index a38bfb3a7..c00e404d8 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,12 @@ New in 2.2.8 2008-??-??: git version 2.2.7a, Libtool team: - Libtool ships and installs man pages for libtool and libtoolize now. - New libtool command line flag --help-all. + - New libtool command line flag --no-silent (with alternate spelling + --no-quiet). This flag (re)enables the default informational messages, + but has no effect on so-called "verbose" output messages. + - New libtool command line flag --no-verbose, which disables only + the extra "verbose" output messages and has no effect on the + default informational messages. * Bug fixes: @@ -13,6 +19,9 @@ New in 2.2.8 2008-??-??: git version 2.2.7a, Libtool team: with Autoconf 2.59 (`possibly undefined macro: LT_LIBEXT'). - Fix 2.2.4 regression that caused arguments with special characters to be mangled by the compile wrapper for uninstalled programs on MinGW. + - libtool command line flag --verbose now also enables explicit + verbose output, in addition to its previous behavior of (re)enabling + only the default informational output. See New Features, --no-silent. * Miscellaneous changes: diff --git a/doc/libtool.texi b/doc/libtool.texi index f03adfb0d..fe9547e06 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -1207,7 +1207,44 @@ Do not print out any progress or informational messages. @item -v @itemx --verbose -Print out progress and informational messages (enabled by default). +Print out progress and informational messages (enabled by default), +as well as additional messages not ordinary seen by default. + +@item --no-quiet +@itemx --no-silent +Print out the progress and informational messages that are seen +by default. This option has no effect on whether the additional +messages seen in @option{--verbose} mode are shown. + +@item --no-verbose +Do not print out any additional informational messages beyond +those ordinarily seen by default. This option has no effect +on whether the ordinary progress and informational messages +enabled by @option{--no-quiet} are shown. + +Thus, there are now three different message levels (not counting +@option{--debug}), depending on whether the normal messages and/or +the additional verbose messages are displayed. Note that there is +no mechanism to diplay verbose messages, without also displaying +normal messages. + +@table @strong +@item default +Normal messages are displayed, verbose messages are not displayed. +In addition to being the default mode, it can be forcibly achieved +by using both option @option{--no-verbose} and either option +@option{--no-silent} or option @option{--no-quiet}. + +@item silent +Neither normal messages nor verbose messages are displayed. This +mode can be achieved using either option @option{--silent} or +option @option{--quiet}. + +@item verbose +Both normal messages and verbose messages are displayed. This mode +can be achieved using either option @option{-v} or option +@option{--verbose}. +@end table @item --version Print libtool version information and exit. diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 7b11e965d..676955a8c 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -40,8 +40,11 @@ m4_divert_push([SCRIPT])# @configure_input@ # --mode=MODE use operation mode MODE # --preserve-dup-deps don't remove duplicate dependency libraries # --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) # --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages # --version print version information # -h, --help, --help-all print short, long, or detailed help message # @@ -319,10 +322,21 @@ func_enable_tag () --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: + opt_verbose=false + ;; + + --no-quiet|--no-silent) + preserve_args="$preserve_args $opt" + opt_silent=false ;; --verbose| -v) preserve_args="$preserve_args $opt" opt_silent=false + opt_verbose=: + ;; + + --no-verbose) preserve_args="$preserve_args $opt" + opt_verbose=false ;; --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break