From: Stefano Lattarini Date: Mon, 21 Jan 2013 13:52:37 +0000 (+0100) Subject: Merge branch 'branch-1.13.2' into maint X-Git-Tag: v1.13b~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63fe125a2e835955b8d0ba0d658208ebf63285f2;p=thirdparty%2Fautomake.git Merge branch 'branch-1.13.2' into maint That branch is for the "emergency" bug-fixing release 1.13.2. * branch-1.13.2: maint: update copyright in files generated by automake and aclocal tests: avoid a spurious failure when running inside Emacs tests: make two new test executable m4: rename an m4 file to a more appropriate name NEWS: update w.r.t. recent documentation fixes compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC docs: parallel-tests is no longer experimental docs: serial-tests are not deprecated, just discouraged NEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14 Signed-off-by: Stefano Lattarini --- 63fe125a2e835955b8d0ba0d658208ebf63285f2 diff --cc NEWS index 09bfc1ed6,acd35758f..62d38b221 --- a/NEWS +++ b/NEWS @@@ -49,92 -43,46 +43,114 @@@ New in 1.13.2 should take precedence over the same-named automake-provided macro (defined in '/usr/local/share/aclocal-1.14/vala.m4'). -* Obsolescent features: - - - Use of suffix-less info files (that can be specified through the - '@setfilename' macro in Texinfo input files) is discouraged, and - its use will raise warnings in the 'obsolete' category. +* C compilation, and the AC_PROG_CC and AM_PROG_CC_C_O macros: + + - The 'compile' script is now unconditionally required for all + packages that perform C compilation (note that if you are using + the '--add-missing' option, automake will fetch that script for + you, so you shouldn't need any explicit adjustment). + This new behaviour is needed to avoid obscure errors when the + 'subdir-objects' option is used, and the compiler is an inferior + one that doesn't grasp the combined use of both the "-c -o" + options; see discussion about automake bug#13378 for more details: + + + + - Automake will automatically enhance the AC_PROG_CC autoconf macro + to make it check, at configure time, that the C compiler supports + the combined use of both the "-c -o" options. This "rewrite" of + AC_PROG_CC is only meant to be temporary, since future Autoconf + versions should provide all the features Automake needs. + + - The AM_PROG_CC_C_O is no longer useful, and its use is a no-op + now. Future Automake versions might start warning that this + macro is obsolete. For better backward-compatibility, this macro + still sets a proper 'ac_cv_prog_cc_*_c_o' cache variable, and + define the 'NO_MINUS_C_MINUS_O' C preprocessor symbol, but you + should really stop relying on that. + - * Obsolescent features: - - - Use of suffix-less info files (that can be specified through the - '@setfilename' macro in Texinfo input files) is discouraged, and - its use will raise warnings in the 'obsolete' category. Simply - use the '.info' extension for all your info files, transforming - usages like: - - @setfilename myprogram - - into: - - @setfilename myprogram.info - - - Use of Texinfo input files with '.txi' or '.texinfo' extensions - is discouraged, and its use will raise warnings in the 'obsolete' - category. You are advised to simply use the '.texi' extension - instead. - - * Documentation fixes: - - - The long-deprecated but still supported two-arguments invocation form - of AM_INIT_AUTOMAKE is documented once again. This seems the sanest - thing to do, given that support for such an usage might need to remain - in place for a unspecified amount of time in order to cater for people - who want to define the version number for their package dynamically at - configure runtime (unfortunately, Autoconf does not yet support this - scenario, so we cannot delegate the work to it). - +* Texinfo support: + + - Automake can now be instructed to place '.info' files generated from + Texinfo input in the builddir rather than in the srcdir; this is done + specifying the new automake option 'info-in-builddir'. This feature + was requested by the developers of GCC, GDB, GNU binutils and the GNU + bfd library. See the extensive discussion about automake bug#11034 + for more details. + + - For quite a long time, Automake has been implementing an undocumented + hack which ensured that '.info' files which appeared to be cleaned + (by e.g. being listed in the CLEANFILES or DISTCLEANFILES variables) + were built in the builddir rather than in the srcdir; this hack was + introduced to ensure better backward-compatibility with packages such + as Texinfo, which did things like: + + info_TEXINFOS = texinfo.txi info-stnd.texi info.texi + DISTCLEANFILES = texinfo texinfo-* info*.info* + # Do not create info files for distribution. + dist-info: + @: + + in order not to distribute generated '.info' files. + + Now that we have the 'info-in-builddir' option that explicitly causes + generated '.info' files to be placed in the builddir, this hack should + be longer necessary, so we deprecate it with runtime warnings. It will + likely be removed altogether in Automake 1.14. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Use of Texinfo input files with '.txi' or '.texinfo' extensions - is discouraged, and its use will raise warnings in the 'obsolete' - category. You are advised to simply use the '.texi' extension - instead. ++New in 1.13.2: + + * Documentation fixes: + + - The long-deprecated but still supported two-arguments invocation form + of AM_INIT_AUTOMAKE is documented once again. This seems the sanest + thing to do, given that support for such an usage might need to remain + in place for a unspecified amount of time in order to cater for people + who want to define the version number for their package dynamically at + configure runtime (unfortunately, Autoconf does not yet support this + scenario, so we cannot delegate the work to it). + + - The serial testsuite harness is no longer reported as "deprecated", + but as "discouraged". We have no plan to remove it, not to make its + use cause runtime warnings. + + - The parallel testsuite is no longer reported as "experimental"; it + is well tested, ans should be stable now. + ++* Obsolescent features: ++ ++ - Use of suffix-less info files (that can be specified through the ++ '@setfilename' macro in Texinfo input files) is discouraged, and ++ its use will raise warnings in the 'obsolete' category. Simply ++ use the '.info' extension for all your info files, transforming ++ usages like: ++ ++ @setfilename myprogram ++ ++ into: ++ ++ @setfilename myprogram.info ++ ++ - Use of Texinfo input files with '.txi' or '.texinfo' extensions ++ is discouraged, and its use will raise warnings in the 'obsolete' ++ category. You are advised to simply use the '.texi' extension ++ instead. ++ ++ + * Bugs fixed: + + - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once + again, as they did in Automake 1.12.x (albeit printing runtime + warnings in the 'obsolete' category). Removing them has turned + out to be a very bad idea, because it complicated distro packing + enormously. Making them issue fatal warnings, as we did in + Automake 1.13, has turned out to be a similarly very bad idea, + for exactly the same reason. + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + New in 1.13.1: * Bugs fixed: diff --cc t/list-of-tests.mk index 0f5dbee01,f1e3dca81..0acbdcfae --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@@ -130,9 -130,8 +130,9 @@@ t/amhello-cross-compile.sh t/amhello-binpkg.sh \ t/aminit-moreargs-deprecation.sh \ t/amassign.sh \ - t/am-config-header-no-more.sh \ - t/am-prog-cc-stdc-no-more.sh \ + t/am-config-header.sh \ + t/am-prog-cc-stdc.sh \ +t/am-prog-cc-c-o.sh \ t/am-macro-not-found.sh \ t/amopt.sh \ t/amopts-location.sh \