From 6726de52639e8c5612dd314504cb6196a0d09648 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 7 Sep 2014 01:46:42 -0700 Subject: [PATCH] Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old. * configure.ac: Assume verbose output for older Automake. Fixes: debbugs:18415 --- ChangeLog | 5 +++++ configure.ac | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4b2d9f9329f..523d4724e09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-09-07 Paul Eggert + + Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old (Bug#18415). + * configure.ac: Assume verbose output for older Automake. + 2014-09-04 Paul Eggert * configure.ac (MAKEINFO): Clean up some configuration bitrot. diff --git a/configure.ac b/configure.ac index cccd73ee420..6bfa8cc4ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -980,6 +980,17 @@ if test "${enableval}" != "no"; then fi fi) +dnl Port to Automake 1.11. +dnl This section can be removed once we assume Automake 1.14 or later. +: ${AM_DEFAULT_VERBOSITY=1} +: ${AM_V=$AM_DEFAULT_VERBOSITY} +: ${AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY} +AC_SUBST([AM_V]) +AM_SUBST_NOTMAKE([AM_V]) +AC_SUBST([AM_DEFAULT_V]) +AM_SUBST_NOTMAKE([AM_DEFAULT_V]) +AC_SUBST([AM_DEFAULT_VERBOSITY]) + dnl Some other nice autoconf tests. dnl These are commented out, since gl_EARLY and/or Autoconf already does them. dnl AC_PROG_INSTALL -- 2.11.4.GIT