Merge branch 'maint' into branch-1.11

* maint:
  tests: make 'lzip.test' executable
  dist: obsolete support for lzma (superseded by xz and lzip)
  test defs: more granular overriding of the make program
  docs: fix a couple broken anchors
  dist: add support for lzip compression
  docs: fix paragraph names for automake and aclocal invocations
  tests: fix spurious failure due to autom4te caching
  maint: autogenerate ChangeLog
  fix: last entry in ChangeLog
  tests: tweak tests on silent-rules for makes without nested vars
  silent-rules: fallback for makes without nested vars

diff --cc ChangeLog.11
Simple merge

diff --cc NEWS
index b656d71,fa1e75e..fb929f5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,10 -2,16 +2,17 @@@ New in 1.11.2a
  
  * WARNING: Future backward-incompatibilities!
  
 -  - The Automake support for automatic de-ANSI-fication will be removed in
 -    the next major Automake release (1.12).
 -
 +  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
 +    GNU rx library has been decommissioned), and will be removed in the
 +    next major Automake release (1.12).
 +
+   - The `lzma' compression format for distribution archives has been
+     deprecated in favor of `xz' and `lzip', and will be removed in the
+     next major Automake release (1.12).
+ 
+   - The `--acdir' option of aclocal is deprecated, and will probably be
+     removed in the next major Automake release (1.12).
+ 
    - The exact order in which the directories in the aclocal macro
      search path are looked up is probably going to be changed in the
      next Automake release (1.12).
@@@ -31,33 -46,6 +40,40 @@@
    - The last relics of Python 1.5 support have been removed from the
      AM_PATH_PYTHON macro.
  
 +Bugs fixed in 1.11.2a:
 +
 +* Long-standing bugs:
 +
 +  - The "deleted header file problem" for *.am files is avoided by stub
 +    rules.  This allows `make' to trigger a rerun of `automake' also if
 +    some previously needed `.am' file has been removed.
 +
++  - The `silent-rules' option now generates working makefiles even
++    for the uncommon `make' implementations that do not support the
++    nested-variables extension to POSIX 2008.  For such `make'
++    implementations, whether a build is silent is determined at
++    configure time, and cannot be overridden at make time with
++    `make V=0' or `make V=1'.
++
 +\f
 +New in 1.11.2:
 +
 +* Changes to aclocal:
 +
 +  - The `--acdir' option is deprecated.  Now you should use the new options
 +    `--automake-acdir' and `--system-acdir' instead.
 +
 +  - The `ACLOCAL_PATH' environment variable is now interpreted as a
 +    colon-separated list of additional directories to search after the
 +    automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
 +    and before the system acdir (by default ${prefix}/share/aclocal).
 +
 +* Miscellaneous changes:
 +
 +  - The Automake support for automatic de-ANSI-fication has been
 +    deprecated.  I will probably be removed in the next major Automake
 +    release (1.12).
 +
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  

diff --cc automake.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/defs.in
Simple merge