[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.3-13-gdb54373

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=db5437316ffeb3ad51c126ce447cde8396108060

The branch, maint has been updated
       via  db5437316ffeb3ad51c126ce447cde8396108060 (commit)
       via  c298a4af18bc58c92da0f033eebeecae4a4d9f90 (commit)
       via  27fc108a01b54c392f240fab9328314cda07da0e (commit)
       via  175cbfc39c91e526d8abde24bfe3293aae2b9a58 (commit)
       via  cf41f5af46f715077219cd2ec86471021e782937 (commit)
      from  d343f7af1481ecb017dbf2aefd7b7c66622d2d33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 NEWS                                               |   28 +++++++++++-------
 doc/automake.texi                                  |    2 +-
 lib/Automake/ChannelDefs.pm                        |    2 +-
 lib/texinfo.tex                                    |   19 +++++++++++--
 t/backcompat.sh                                    |    4 +-
 t/backcompat2.sh                                   |   12 ++++----
 t/backcompat3.sh                                   |   12 ++++----
 t/backcompat5.sh                                   |    5 ++-
 t/backcompat6.sh                                   |    5 ++-
 t/cygnus-imply-foreign.sh                          |    2 +-
 t/list-of-tests.mk                                 |    1 +
 ...st-acconfig.sh => warnings-obsolete-default.sh} |   29 ++++++++-----------
 12 files changed, 69 insertions(+), 52 deletions(-)
 copy t/{autodist-acconfig.sh => warnings-obsolete-default.sh} (64%)

diff --git a/NEWS b/NEWS
index 1d54541..35244ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.12.3:
+New in 1.12.4:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -6,6 +6,9 @@ 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.
 
+  - 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
@@ -46,19 +49,11 @@ New in 1.12.3:
   - 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 is deprecated, and will be removed in the
-    next major Automake version (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 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 'missing' script will not try anymore to update the timestamp
     of out-of-date files that require a maintainer-specific tool to be
     remade, in case the user lacks such a tool (or has a too-old version
@@ -66,6 +61,17 @@ 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.
+
+  - 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
@@ -162,8 +168,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 416fa6d..db90c65 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2709,7 +2709,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.
 On the other hand, the @option{silent-rules} options (@pxref{Options})
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 02ce849..a465cbc 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 dc4bf64..f458ba7 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 fa83687..214515d 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/backcompat2.sh b/t/backcompat2.sh
index 84bf642..109483b 100755
--- a/t/backcompat2.sh
+++ b/t/backcompat2.sh
@@ -23,9 +23,9 @@ am_create_testdir=empty
 
 # A trick to make the test run muuuch faster, by avoiding repeated
 # runs of aclocal (one order of magnitude improvement in speed!).
-echo 'AC_INIT(x,0) AM_INIT_AUTOMAKE' > configure.in
+echo 'AC_INIT(x,0) AM_INIT_AUTOMAKE' > configure.ac
 $ACLOCAL
-rm -rf configure.in autom4te.*
+rm -rf configure.ac autom4te.*
 
 touch install-sh missing
 
@@ -35,13 +35,13 @@ cat > config.h.in <<'END'
 END
 
 for am_arg3 in ':' 'false' '#' ' '; do
-  unindent > configure.in <<END
+  unindent > configure.ac <<END
     AC_INIT
     AC_CONFIG_HEADERS([config.h])
     AM_INIT_AUTOMAKE([pkgname], [pkgversion], [$am_arg3])
     AC_OUTPUT
 END
-  cat configure.in # For debugging.
+  cat configure.ac # For debugging.
   $AUTOCONF
   ./configure
   cat config.h # For debugging.
@@ -56,13 +56,13 @@ END
 done
 
 for am_extra_args in '' ',' ', []'; do
-  unindent > configure.in <<END
+  unindent > configure.ac <<END
     AC_INIT
     AC_CONFIG_HEADERS([config.h])
     AM_INIT_AUTOMAKE([pkgname], [pkgversion]$am_extra_args)
     AC_OUTPUT
 END
-  cat configure.in # For debugging.
+  cat configure.ac # For debugging.
   $AUTOCONF
   ./configure
   cat config.h # For debugging.
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
index e00992b..f25bd57 100755
--- a/t/backcompat3.sh
+++ b/t/backcompat3.sh
@@ -42,14 +42,14 @@ END
 
 ### Run 1 ###
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([ac_name], [ac_version])
 AM_INIT_AUTOMAKE([am_name], [am_version])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
-cat configure.in
+cat configure.ac
 
 $ACLOCAL
 $AUTOCONF
@@ -75,7 +75,7 @@ diff exp got
 
 ### Run 2 ###
 
-cat > configure.in <<'END'
+cat > configure.ac <<'END'
 dnl: 'AC_INIT' in Autoconf <= 2.63 doesn't have an URL argument.
 dnl: Luckily, 'AC_AUTOCONF_VERSION' and 'm4_version_prereq' are
 dnl: both present in autoconf 2.62, which we require; so that we
@@ -90,7 +90,7 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
-cat configure.in
+cat configure.ac
 
 $ACLOCAL
 $AUTOCONF
@@ -116,14 +116,14 @@ diff exp got
 
 ### Run 3 ###
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([ac_name], [ac_version])
 AM_INIT_AUTOMAKE([am_name], [am_version], [am_foo_quux])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
-cat configure.in
+cat configure.ac
 
 $ACLOCAL
 $AUTOCONF
diff --git a/t/backcompat5.sh b/t/backcompat5.sh
index a5ab70c..caeac07 100755
--- a/t/backcompat5.sh
+++ b/t/backcompat5.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 autoconf input file.
 # This script can also serve as mild stress-testing for Automake.
 # See also the similar test 'backcompat6.sh'.
 
@@ -92,7 +93,7 @@ TESTS = a.test
 EXTRA_DIST = $(TESTS)
 END
 
-$ACLOCAL
+$ACLOCAL -Wno-obsolete
 $AUTOCONF
 $AUTOMAKE -a -Wno-obsolete
 test -f install-sh
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index 30403dd..ee86e36 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.sh'.
 
@@ -77,7 +78,7 @@ int main (void)
 }
 END
 
-$ACLOCAL
+$ACLOCAL -Wno-obsolete
 $AUTOMAKE -Wno-obsolete --add-missing
 $AUTOCONF
 
diff --git a/t/cygnus-imply-foreign.sh b/t/cygnus-imply-foreign.sh
index 9a5ef7f..4612650 100755
--- a/t/cygnus-imply-foreign.sh
+++ b/t/cygnus-imply-foreign.sh
@@ -29,7 +29,7 @@ $ACLOCAL
 
 # We want complete control automake flags, while honouring the
 # user overrides for $AUTOMAKE.
-AUTOMAKE=$am_original_AUTOMAKE
+AUTOMAKE="$am_original_AUTOMAKE -Wno-obsolete"
 
 # Sanity check: gnu mode must complain about missing files and
 # portability problems.
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index ff4448e..8e1093a 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1231,6 +1231,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/autodist-acconfig.sh b/t/warnings-obsolete-default.sh
similarity index 64%
copy from t/autodist-acconfig.sh
copy to t/warnings-obsolete-default.sh
index 98db0a6..fc439ea 100755
--- a/t/autodist-acconfig.sh
+++ b/t/warnings-obsolete-default.sh
@@ -14,31 +14,26 @@
 # 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 'acconfig.h' is automatically distributed if it exists
-# (at automake runtime).
-# Related to automake bug#7819.
+# Check that automake warnings in the 'obsolete' category are enabled
+# by default.
 
 . ./defs || exit 1
 
-cat >> configure.ac <<END
-AC_OUTPUT
-END
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
+
+echo AC_PROG_CC >> configure.ac
 
 cat > Makefile.am <<'END'
-.PHONY: test
-test: distdir
-       ls -l $(distdir)
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
-       test -f $(distdir)/acconfig.h
+bin_PROGRAMS = foo
+INCLUDES = -Ibar
 END
 
-: > acconfig.h
-
 $ACLOCAL
-$AUTOMAKE
-$AUTOCONF
+AUTOMAKE_fails
+grep '^Makefile\.am:2:.*INCLUDES.*AM_CPPFLAGS' stderr
 
-./configure
-$MAKE test
+# Check that we can override warnings about obsolete stuff.
+$AUTOMAKE -Wno-obsolete
 
 :


hooks/post-receive
-- 
GNU Automake