Merge branch 'cygnus-deprecate' into maint

* cygnus-deprecate:
  cygnus: warn when it's used (flagged as 'obsolete' now)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc NEWS
index e7570d0,bc867c4..1d4a19e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -53,31 -60,6 +49,35 @@@ New in 1.12.1
      search path are looked up is probably going to be changed in the
      next Automake release (1.13).
  
 +* Deprecated obsolescent features:
 +
++  - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option) is
++    now deprecated (its use triggers a warning in the 'obsolete' category).
++    It will be removed in the next major Automake release (1.13).
++
 +  - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
 +    variable, @mkdir_p@ configure-time substitution and AM_PROG_MKDIR
 +    m4 macro are deprecated, eliciting a warning in the 'obsolete'
 +    category.  They will be removed in the next major version (1.13).
 +
 +Bugs fixed in 1.12.1:
 +
 +* Bugs introduced by 1.12:
 +
 +   - Several weaknesses in the Automake's own build system test suite
 +     have been fixed.
 +
 +* Long-standing bugs:
 +
 +  - When the 'color-tests' option is in use, forcing of colored testsuite
 +    output through "AM_COLOR_TESTS=always" works even if the terminal is
 +    a non-ANSI one, i.e., if the TERM environment variable has a value of
 +    "dumb".
 +
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +New in 1.12:
 +
  * Obsolete features removed:
  
    - The never documented nor truly used script 'acinstall' has been

diff --cc automake.in
Simple merge

diff --cc t/list-of-tests.mk
Simple merge