[SCM] GNU Libtool branch, master, updated. v2.4.2-325-gd5c1465

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  d5c146580c21ee603458d92983d27e7af1260667 (commit)
       via  87d3655d1c390053ab71cb1f483607f6e5980fcc (commit)
      from  f1a3325bf86a015d28930982bfa28f9c63621745 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d5c146580c21ee603458d92983d27e7af1260667
Author: Gary V. Vaughan <address@hidden>
Date:   Tue Oct 23 22:17:24 2012 -0500

    bootstrap: emphasize command executions with terminal bold.
    
    * bootstrap.in (func_show_eval): Use $require_term_colors to
    embolden the command about to be executed in output.
    * bootstrap: Regenerate.
    * bootstrap.conf (libtool_build_prerequisites): Use the standard
    (colorful!) bootstrap func_show_eval here too.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 87d3655d1c390053ab71cb1f483607f6e5980fcc
Author: Gary V. Vaughan <address@hidden>
Date:   Tue Oct 23 21:58:11 2012 -0500

    bootstrap: show output from 'make bootstrap-deps'.
    
    * bootstrap.conf (libtool_build_prerequisites): Add support for
    AM_V_GEN and AM_V_at to the temporary pre-configure Makefile.
    Instead of eliding non-error output from bootstrap-deps, show
    the results, with verbosity set according to $opt_verbose.
    * Makefile.am (m4/ltversion.m4, build-aux/ltmain.sh, libtool)
    (README): Fix the display rules to correctly fall-back to
    AM_DEFAULT_VERBOSITY when V=1 is not passed to make invocation.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am               |   12 ++++++++----
 bootstrap                 |    4 +++-
 bootstrap.conf            |   23 +++++++++++++++--------
 gl/build-aux/bootstrap.in |    4 +++-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6421755..d7baa93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,8 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
          else \
            serial=`$(git_commit_count)`; \
          fi; \
-         if test 0 = '$(V)'; then echo "  GEN   " $@; \
+         if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
+           then echo "  GEN     " $@; \
          else echo $(bootstrap_edit) "'$(ltversion_in)' > '$@'"; fi; \
          $(bootstrap_edit) '$(ltversion_in)' > '$@'; \
          chmod a-w '$@'; \
@@ -158,7 +159,8 @@ $(ltmain_sh): $(ltmain_in) $(dotversion)
        done; \
        if $$rebuild; then \
          rm -f '$@'; \
-         if test 0 = '$(V)'; then echo "  GEN   " $@; \
+         if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
+           then echo "  GEN     " $@; \
          else echo "$(inline_source) '$(ltmain_in)' |" $(bootstrap_edit) "> 
'$@'"; fi; \
          $(inline_source) '$(ltmain_in)' | $(bootstrap_edit) > '$@'; \
          chmod a-w '$@'; \
@@ -294,7 +296,8 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
          case $$prereq in *.version);; *) rebuild=:;; esac; \
        done; \
        if $$rebuild; then \
-         if test 0 = '$(V)'; then echo "  GEN   " $@; \
+         if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
+           then echo "  GEN     " $@; \
          else echo '$(SHELL) $(top_builddir)/config.status "$@"'; fi; \
          cd '$(top_builddir)' && '$(SHELL)' ./config.status '$@'; \
        fi
@@ -547,7 +550,8 @@ EXTRA_DIST += $(edit_readme_alpha)
 re_odd_version = '\([0-9][0-9]*.[0-9][0-9]*.[0-9]*[13579]\)'
 $(readme): FORCE
        @if test -n `expr $(VERSION) : $(re_odd_version)`; then \
-         if test 0 = '$(V)'; then echo "  GEN   " $@; \
+         if test 0 = '$(AM_DEFAULT_VERBOSITY)' && 1 != '$(V)'; \
+           then echo "  GEN     " $@; \
          else echo "$(SHELL) $(edit_readme_alpha) $@"; fi; \
          $(SHELL) $(edit_readme_alpha) '$@'; \
        fi
diff --git a/bootstrap b/bootstrap
index 1a496d6..f9d8b9d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4240,13 +4240,15 @@ func_show_eval ()
 {
     $debug_cmd
 
+    $require_term_colors
+
     _G_cmd=$1
     _G_fail_exp=${2-':'}
 
     ${opt_silent-'false'} || {
       func_quote_for_eval $_G_cmd
       eval func_truncate_cmd $func_quote_for_eval_result
-      func_echo "running: $func_truncate_cmd_result"
+      func_echo "running: $tc_bold$func_truncate_cmd_result$tc_reset"
     }
 
     ${opt_dry_run-'false'} || {
diff --git a/bootstrap.conf b/bootstrap.conf
index 085f79e..ac0ac08 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -203,21 +203,28 @@ libtool_build_prerequisites ()
       echo "aux_dir = $build_aux"
       echo "ltdl_dir = $ltdl_dir"
       echo "macro_dir = $macro_dir"
+
+      # The following allow us to tie bootstrap-deps output verbosity
+      # into the bootstrap --verbose option:
+      echo 'AM_V_GEN = $(am__v_GEN_$(V))'
+      echo 'am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))'
+      echo 'am__v_GEN_0 = @echo "  GEN     " $@;'
+      echo 'AM_V_at = $(am__v_at_$(V))'
+      echo 'am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))'
+      echo 'am__v_at_0 = @'
+
       $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d;/^include /d' $makes
     } > Makefile
 
     # Building distributed files from configure is bad for automake, so we
     # generate them here, and have Makefile rules to keep them up to date.
-    func_echo "running: $MAKE bootstrap-deps ..."
-    $opt_dry_run || {
-    output=`$MAKE bootstrap-deps  \
-        PACKAGE="$package" PACKAGE_BUGREPORT="$package_bugreport" \
-        PACKAGE_NAME="$package_name" PACKAGE_URL="$package_url" \
-        SED="$SED" srcdir=. VERSION="$package_version" 2>&1`
-    }
+    func_show_eval "$MAKE bootstrap-deps \
+        AM_DEFAULT_VERBOSITY=0 `$opt_verbose && echo V=1` \
+        PACKAGE='$package' PACKAGE_BUGREPORT='$package_bugreport' \
+        PACKAGE_NAME='$package_name' PACKAGE_URL='$package_url' \
+        SED='$SED' srcdir=. VERSION='$package_version'"
     status=$?
 
-    test 0 -eq "$status" || echo "$output"
     rm -f Makefile
     test 0 -eq "$status" ||exit $EXIT_FAILURE
 }
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 1925410..7de22ff 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2072,13 +2072,15 @@ func_show_eval ()
 {
     $debug_cmd
 
+    $require_term_colors
+
     _G_cmd=$1
     _G_fail_exp=${2-':'}
 
     ${opt_silent-'false'} || {
       func_quote_for_eval $_G_cmd
       eval func_truncate_cmd $func_quote_for_eval_result
-      func_echo "running: $func_truncate_cmd_result"
+      func_echo "running: $tc_bold$func_truncate_cmd_result$tc_reset"
     }
 
     ${opt_dry_run-'false'} || {


hooks/post-receive
-- 
GNU Libtool