Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old.

* configure.ac: Assume verbose output for older Automake.

Fixes: debbugs:18415

diff --git a/ChangeLog b/ChangeLog
index 4b2d9f9329fbae7be0f39994c2b96d07d05d4e5e..523d4724e094f2e3b7b67adb3fd0c22d59b2bde9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old (Bug#18415).
+       * configure.ac: Assume verbose output for older Automake.
+
 2014-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac (MAKEINFO): Clean up some configuration bitrot.

diff --git a/configure.ac b/configure.ac
index cccd73ee420ea3cbcf3a761727860971e6d74826..6bfa8cc4ad291d9fafabe815a9f8ee65baa3ef52 100644 (file)
--- 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