From: Stefano Lattarini Date: Wed, 2 May 2012 08:26:12 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.12b~156 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b618b5854c68784781593b44bdd9c7ae7bd9d79e;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: cosmetics: fix typo in aclocal m4 directory README cygnus: warn when it's used (flagged as 'obsolete' now) Signed-off-by: Stefano Lattarini --- b618b5854c68784781593b44bdd9c7ae7bd9d79e diff --cc NEWS index 13dbbceea,1d4a19e94..4cebf869b --- a/NEWS +++ b/NEWS @@@ -49,10 -18,24 +49,6 @@@ New in 1.12.1 harness will still be available through the use of the 'serial-tests' option. - - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option) - will be deprecated in the next minor version of Automake (1.12.1) and - removed in the next major version (1.13). - - The following long-obsolete m4 macros will be removed in the - next major Automake version (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' will be removed in - the next major Automake version (1.13). -- - Support for the two- and three-arguments invocation forms of the AM_INIT_AUTOMAKE macro will be deprecated in the next minor version of Automake (1.12.1) and removed in the next major version (1.13).