diff options
| -rw-r--r-- | NEWS | 69 | ||||
| -rw-r--r-- | doc/automake.texi | 2 | ||||
| -rw-r--r-- | lib/Automake/ChannelDefs.pm | 2 | ||||
| -rw-r--r-- | lib/texinfo.tex | 19 | ||||
| -rwxr-xr-x | t/backcompat.sh | 4 | ||||
| -rwxr-xr-x | t/backcompat6.sh | 5 | ||||
| -rw-r--r-- | t/list-of-tests.mk | 1 | ||||
| -rwxr-xr-x | t/warnings-obsolete-default.sh | 39 |
8 files changed, 118 insertions, 23 deletions
@@ -144,7 +144,7 @@ New in 1.13: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -New in 1.12.3: +New in 1.12.4: * WARNING: Future backward-incompatibilities! @@ -152,11 +152,24 @@ New in 1.12.3: long-deprecated 'configure.in' name for the Autoconf input file. You are advised to use the recommended name 'configure.ac' instead. - - Starting from the next major Automake version (1.13), the rules to - build pdf, ps and dvi output from Texinfo input will use the '--tidy' - option by default. Since such an option was introduced in Texinfo - 4.9, this means that Makefiles generated by future Automake versions - will require at least that version of Texinfo. + - Support for the "Cygnus-style" trees (as enabled by the 'cygnus' + option) will be removed in the next major Automake release (1.13). + + - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will + be removed in Automake 1.13. The $(mkdir_p) make variable and the + @mkdir_p@ substitution will still remain available (as aliases of + $(MKDIR_P)) for the moment, for better backward compatibility. + + - Autoconf 2.65 or later will be required by the next major Automake + version (1.13). Until now, Automake has required Autoconf version + 2.62 or later. + + - Starting from the next major Automake version (1.13), the rules + to build pdf, ps and dvi output from Texinfo input will use the + '--build-dir' option by default. Since such an option was only + introduced in Texinfo 4.9, this means that Makefiles generated by + future Automake versions will require at least that version of + Texinfo. - Starting from the next major Automake version (1.13), the parallel testsuite harness (previously only enabled by the 'parallel-tests' @@ -164,13 +177,28 @@ New in 1.12.3: harness will still be available through the use of the 'serial-tests' option. - - Support for the two- and three-arguments invocation forms of the - AM_INIT_AUTOMAKE macro is deprecated, and will be removed in the - next major Automake 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). - - 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.13). + - The '--acdir' option of aclocal is deprecated, and will probably + be removed in the next major Automake release (1.13). You should + use the options '--automake-acdir' and '--system-acdir' instead + (which have been introduced in Automake 1.11.2). - The 'missing' script will not try anymore to update the timestamp of out-of-date files that require a maintainer-specific tool to be @@ -179,6 +207,19 @@ New in 1.12.3: giving more useful warnings than a bare "command not found" from a make recipe would. +* Warnings and deprecations: + + - Warnings in the 'obsolete' category are enabled by default both in + automake and aclocal. + +* Miscellaneous changes: + + - Some testsuite weaknesses and spurious failures have been fixed. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +New in 1.12.3: + * Miscellaneous changes: - The '.m4' files provided by Automake does not define serial numbers @@ -275,8 +316,8 @@ New in 1.12.1: - Use of the long-deprecated two- and three-arguments invocation forms of the AM_INIT_AUTOMAKE macro now elicits a warning in the 'obsolete' - category. Starting from the next major Automake release (1.13), such - usages won't be allowed anymore. + category. Starting from some future major Automake release (likely + post-1.13), such usages won't be allowed anymore. - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option) is now deprecated (its use triggers a warning in the 'obsolete' category). diff --git a/doc/automake.texi b/doc/automake.texi index 7b62dcb0c..13db2c1c5 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -2689,7 +2689,7 @@ A category can be turned off by prefixing its name with @samp{no-}. For instance, @option{-Wno-syntax} will hide the warnings about unused variables. -The categories output by default are @samp{syntax} and +The categories output by default are @samp{obsolete}, @samp{syntax} and @samp{unsupported}. Additionally, @samp{gnu} and @samp{portability} are enabled in @option{--gnu} and @option{--gnits} strictness. diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm index 02ce8493f..a465cbc6d 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -156,7 +156,7 @@ register_channel 'automake', type => 'fatal', backtrace => 1, register_channel 'extra-portability', type => 'warning', silent => 1; register_channel 'gnu', type => 'warning'; -register_channel 'obsolete', type => 'warning', silent => 1; +register_channel 'obsolete', type => 'warning'; register_channel 'override', type => 'warning', silent => 1; register_channel 'portability', type => 'warning', silent => 1; register_channel 'portability-recursive', type => 'warning', silent => 1; diff --git a/lib/texinfo.tex b/lib/texinfo.tex index dc4bf6400..f458ba726 100644 --- a/lib/texinfo.tex +++ b/lib/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2012-07-29.17} +\def\texinfoversion{2012-09-04.17} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -594,7 +594,7 @@ \def\:{\spacefactor=1000 } % @* forces a line break. -\def\*{\hfil\break\hbox{}\ignorespaces} +\def\*{\unskip\hfil\break\hbox{}\ignorespaces} % @/ allows a line break. \let\/=\allowbreak @@ -3269,6 +3269,19 @@ end \finishedtitlepagetrue } +% Settings used for typesetting titles: no hyphenation, no indentation, +% don't worry much about spacing, ragged right. This should be used +% inside a \vbox, and fonts need to be set appropriately first. Because +% it is always used for titles, nothing else, we call \rmisbold. +% +\def\raggedtitlesettings{% + \rmisbold + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 + \ptexraggedright +} + % Macros to be used within @titlepage: \let\subtitlerm=\tenrm @@ -3276,7 +3289,7 @@ end \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rmisbold #1} + \vbox{\titlefonts \raggedtitlesettings #1} % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt diff --git a/t/backcompat.sh b/t/backcompat.sh index fa8368763..214515d17 100755 --- a/t/backcompat.sh +++ b/t/backcompat.sh @@ -46,13 +46,13 @@ END for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do for am_extra_args in '' ', []' ', [:]' ', [false]'; do rm -rf autom4te*.cache config* Makefile.in Makefile - unindent > configure.in <<END + unindent > configure.ac <<END $ac_init AM_INIT_AUTOMAKE([FooBar], [0.7.1]$am_extra_args) AC_CONFIG_FILES([Makefile]) AC_OUTPUT END - cat configure.in # For debugging. + cat configure.ac # For debugging. $ACLOCAL $AUTOCONF $AUTOMAKE -Wno-obsolete diff --git a/t/backcompat6.sh b/t/backcompat6.sh index 9fc494642..bcfd3dc75 100755 --- a/t/backcompat6.sh +++ b/t/backcompat6.sh @@ -15,7 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Backward-compatibility test: try to build and distribute a package -# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT. +# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT, +# and 'configure.in' as autconf input file. # This script can also serve as mild stress-testing for Automake. # See also the similar test 'backcompat5.test'. @@ -77,7 +78,7 @@ int main (void) } END -$ACLOCAL +$ACLOCAL -Wno-obsolete $AUTOMAKE -Wno-obsolete --add-missing $AUTOCONF diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index cb6d445dd..57bc89bdd 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -1229,6 +1229,7 @@ t/vtexi.sh \ t/vtexi2.sh \ t/vtexi3.sh \ t/vtexi4.sh \ +t/warnings-obsolete-default.sh \ t/warnings-override.sh \ t/warnings-precedence.sh \ t/warnings-strictness-interactions.sh \ diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh new file mode 100755 index 000000000..fc439eab9 --- /dev/null +++ b/t/warnings-obsolete-default.sh @@ -0,0 +1,39 @@ +#! /bin/sh +# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Check that automake warnings in the 'obsolete' category are enabled +# by default. + +. ./defs || exit 1 + +# We want (almost) complete control over automake options. +AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror" + +echo AC_PROG_CC >> configure.ac + +cat > Makefile.am <<'END' +bin_PROGRAMS = foo +INCLUDES = -Ibar +END + +$ACLOCAL +AUTOMAKE_fails +grep '^Makefile\.am:2:.*INCLUDES.*AM_CPPFLAGS' stderr + +# Check that we can override warnings about obsolete stuff. +$AUTOMAKE -Wno-obsolete + +: |