From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 24 Oct 2012 02:58:11 +0000 (-0500)
Subject: bootstrap: show output from 'make bootstrap-deps'.
X-Git-Tag: v2.4.2.418~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87d3655d1c390053ab71cb1f483607f6e5980fcc;p=thirdparty%2Flibtool.git

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 <gary@gnu.org>
---

diff --git a/Makefile.am b/Makefile.am
index 6421755bd..d7baa93e9 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.conf b/bootstrap.conf
index 085f79e62..a4af1e6c6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -203,6 +203,16 @@ 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
 
@@ -210,14 +220,14 @@ libtool_build_prerequisites ()
     # 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  \
+      $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" 2>&1`
+        SED="$SED" srcdir=. VERSION="$package_version"
     }
     status=$?
 
-    test 0 -eq "$status" || echo "$output"
     rm -f Makefile
     test 0 -eq "$status" ||exit $EXIT_FAILURE
 }