[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-159-g076e8fa

[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=076e8fa284c2453099286876684be913512af381

The branch, master has been updated
       via  076e8fa284c2453099286876684be913512af381 (commit)
       via  db5437316ffeb3ad51c126ce447cde8396108060 (commit)
       via  c298a4af18bc58c92da0f033eebeecae4a4d9f90 (commit)
       via  27fc108a01b54c392f240fab9328314cda07da0e (commit)
       via  175cbfc39c91e526d8abde24bfe3293aae2b9a58 (commit)
       via  cf41f5af46f715077219cd2ec86471021e782937 (commit)
      from  23a4376fc462bbe0e36b5515671724b7e3d89fb9 (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 -----------------------------------------------------------------
commit 076e8fa284c2453099286876684be913512af381
Merge: 23a4376 db54373
Author: Stefano Lattarini <address@hidden>
Date:   Wed Sep 5 14:40:52 2012 +0200

    Merge branch 'maint'
    
    * maint:
      sync: update files from upstream with "make fetch"
      news: cygnus will be removed in automake 1.13
      news: some changes for 1.13 has been "de-planned"
      news: report that the have seen fixlets after 1.12.3
      warns: enable category 'obsolete' by default
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

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

diff --git a/NEWS b/NEWS
index 5490e72..f243d8c 100644
--- a/NEWS
+++ b/NEWS
@@ -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 7b62dcb..13db2c1 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 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/backcompat6.sh b/t/backcompat6.sh
index 9fc4946..bcfd3dc 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 cb6d445..57bc89b 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/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