Merge branch 'cygnus-remove'

* cygnus-remove:
  cygnus: remove support for Cygnus-style trees

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

diff --cc NEWS
index 4cebf86,386754f..a731fe3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,30 -2,19 +2,34 @@@ New in 1.13
  
  * Obsolete features removed:
  
 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   - Support for the "Cygnus-style" trees (once enabled by the 'cygnus'
+     option) has been removed.  See discussion about automake bug#11034
+     for more background.
+ 
 +  - The automake-provided $(mkdir_p) make variable, @mkdir_p@ configure
 +    time substitution and AM_PROG_MKDIR m4 macro have been removed.  They
 +    had been obsolete since automake 1.10, and actively deprecated since
 +    Automake 1.12.1.
  
 -New in 1.12.1:
 +  - The deprecated aclocal option '--acdir' has been removed.  You
 +    should use the options '--automake-acdir' and '--system-acdir'
 +    instead (which have been introduced in Automake 1.11.2).
  
 -* Deprecated obsolescent features:
 +  - The following long-obsolete m4 macros have been removed:
  
 -  - 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).
 +      AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
 +      fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
 +      fp_WITH_DMALLOC:    old alias for AM_WITH_DMALLOC
 +      AM_CONFIG_HEADER:   superseded by AC_CONFIG_HEADERS since July 2002
 +      ud_PATH_LISPDIR:    old alias for AM_PATH_LISPDIR
 +      jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
 +      ud_GNU_GETTEXT:     old alias for AM_GNU_GETTEXT
 +      gm_PROG_LIBTOOL:    old alias for AC_PROG_LIBTOOL
 +      fp_C_PROTOTYPES:    old alias for AM_C_PROTOTYPES (which was part
 +                          of the now-removed automatic de-ANSI-fication
 +                          support of Automake)
 +
 +  - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  

diff --cc doc/automake.texi
Simple merge

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