[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1774-ge5ae760

[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=e5ae760b9d7d79839a81d847433d44d5cdb2fef7

The branch, master has been updated
       via  e5ae760b9d7d79839a81d847433d44d5cdb2fef7 (commit)
       via  91158d7245f194f7fc40d8da8965c59965112601 (commit)
       via  c5df21e8dde255778896e512f7b7b037049dbf7e (commit)
       via  84fbf466f32d0e47291a91d620f7d4831bba34fe (commit)
       via  be0d69f0467763fca65d3acd1bfe0e03ff987206 (commit)
      from  3a7b60b1ca8a2f2b86acf494d649bff66beb445b (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 e5ae760b9d7d79839a81d847433d44d5cdb2fef7
Merge: 3a7b60b 91158d7
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jan 21 20:52:43 2012 +0100

    Merge branch 'maint'
    
    * maint:
      fixup: distribute 'contrib/multilib/multi.m4'
      multilib: deprecate, will be moved to contrib
      fixlet: flags for Fortran77 compiler are in FFLAGS, not F77FLAGS
      cosmetics: fix a botched comment in a maintainer check

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

Summary of changes:
 Makefile.am                       |   10 ++-----
 NEWS                              |    4 +++
 contrib/Makefile.am               |    1 +
 {m4 => contrib/multilib}/multi.m4 |   12 +++-----
 doc/automake.texi                 |   52 +++++++++++++++++++++++-------------
 lib/Automake/Variable.pm          |    2 +-
 m4/multi.m4                       |    7 +++-
 tests/multlib.test                |   29 ++++++++++++++++----
 8 files changed, 75 insertions(+), 42 deletions(-)
 copy {m4 => contrib/multilib}/multi.m4 (89%)

diff --git a/Makefile.am b/Makefile.am
index fc37ef1..c4234a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -465,7 +465,8 @@ sc_AMDEP_TRUE_in_automake_in:
          exit 1; \
        fi
 
-## Tests should never call make directly.
+## Recursive make invocations should always pass $(AM_MAKEFLAGS)
+## to $(MAKE), for portability to non-GNU make.
 sc_tests_make_without_am_makeflags:
        @if grep '^[^#].*(MAKE) ' $(srcdir)/lib/am/*.am $(srcdir)/automake.in |\
                grep -v 'AM_MAKEFLAGS'; then \
@@ -865,18 +866,15 @@ WGET_SV_CVS = $(WGET) 
http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
 WGET_SV_GIT_CF = $(WGET) 
'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
 WGET_SV_GIT_AC = $(WGET) 
'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
 WGET_SV_GIT_GL = $(WGET) 
'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
-WGET_GCC = $(WGET) 'http://gcc.gnu.org/viewcvs/*checkout*/trunk/'
 
 ## Files that we fetch and which we compare against.
 ## FIXME should be a lot more here
 FETCHFILES = \
 INSTALL \
-config-ml.in \
 config.guess \
 config.sub \
 gnupload \
 gitlog-to-changelog \
-symlink-tree \
 texinfo.tex
 
 ## Fetch the latest versions of files we care about.
@@ -890,9 +888,7 @@ fetch:
        $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
        $(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
        $(WGET_SV_GIT_GL)build-aux/gnupload -O gnupload && \
-       $(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog 
&& \
-       $(WGET_GCC)config-ml.in -O config-ml.in && \
-       $(WGET_GCC)symlink-tree -O symlink-tree)
+       $(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog)
 ## Don't exit after test because we want to give as many errors as
 ## possible.
        @stat=0; for file in $(FETCHFILES); do \
diff --git a/NEWS b/NEWS
index f2bced6..5145357 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ New in 1.11a:
     remains available in the 'contrib/' directory of the Automake
     distribution).
 
+  - The support for the "obscure" multilib feature has been deprecated,
+    and will be moved out of the automake core in the next major Automake
+    release (1.12).
+
   - The deprecated `lzma' compression format for distribution archives
     has been removed, in favor of `xz' and `lzip'.
 
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 970ef75..ce1d699 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -19,4 +19,5 @@
 
 EXTRA_DIST = \
   check-html.am \
+  multilib/multi.m4 \
   README
diff --git a/m4/multi.m4 b/contrib/multilib/multi.m4
similarity index 89%
copy from m4/multi.m4
copy to contrib/multilib/multi.m4
index bc01dcf..9841767 100644
--- a/m4/multi.m4
+++ b/contrib/multilib/multi.m4
@@ -1,22 +1,20 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2011
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 6
 
 # AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR])
 # ---------------------------------------------------
 # Add --enable-multilib to configure.
 AC_DEFUN([AM_ENABLE_MULTILIB],
 [# Default to --enable-multilib
-AC_ARG_ENABLE([multilib],
-[AS_HELP_STRING(
-   [--enable-multilib],
-   [build many library versions (default)])],
+AC_ARG_ENABLE(multilib,
+[  --enable-multilib       build many library versions (default)],
 [case "$enableval" in
   yes) multilib=yes ;;
   no)  multilib=no ;;
@@ -37,7 +35,7 @@ if test "$srcdir" = "."; then
 else
   multi_basedir="$srcdir/$2"
 fi
-AC_SUBST([multi_basedir])
+AC_SUBST(multi_basedir)
 
 # Even if the default multilib is not a cross compilation,
 # it may be that some of the other multilibs are.
diff --git a/doc/automake.texi b/doc/automake.texi
index 6be7ac3..0cdeb7b 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -354,7 +354,7 @@ Miscellaneous Rules
 
 * Tags::                        Interfacing to cscope, etags and mkid
 * Suffixes::                    Handling new file extensions
-* Multilibs::                   Support for multilibs.
+* Multilibs::                   Support for multilibs (deprecated, soon to be 
removed).
 
 Conditionals
 
@@ -2305,8 +2305,11 @@ release.
 
 @item config-ml.in
 This file is not a program, it is a @file{configure} fragment used for
-multilib support (@pxref{Multilibs}).  This file is maintained in the
-GCC tree at @url{http://gcc.gnu.org/svn.html}.
+multilib support (@pxref{Multilibs}).  Since the Automake multilib
+support has been @emph{deprecated} and targeted for removal, this
+file is going to be @emph{removed from the Automake core} in the next
+major release.  The master copy of this file is maintained in the GCC
+tree at @url{http://gcc.gnu.org/svn.html}.
 
 @item depcomp
 This program understands how to run a compiler so that it will
@@ -2347,8 +2350,11 @@ This is used to byte-compile Python scripts.
 @item symlink-tree
 This program duplicates a tree of directories, using symbolic links
 instead of copying files.  Such an operation is performed when building
-multilibs (@pxref{Multilibs}).  This file is maintained in the GCC
-tree at @url{http://gcc.gnu.org/svn.html}.
+multilibs (@pxref{Multilibs}).  Since the Automake multilib support has
+been @emph{deprecated} and targeted for removal, this file is going to
+be @emph{removed from the Automake core} in the next major release.
+The master copy of this file is maintained in the GCC tree at
address@hidden://gcc.gnu.org/svn.html}.
 
 @item test-driver
 This implements the default test driver offered by the parallel
@@ -3954,12 +3960,18 @@ Automake ships with several Autoconf macros that you 
can use from your
 
 @item AM_ENABLE_MULTILIB
 @acindex AM_ENABLE_MULTILIB
-This is used when a ``multilib'' library is being built.  The first
-optional argument is the name of the @file{Makefile} being generated; it
-defaults to @samp{Makefile}.  The second optional argument is used to find
-the top source directory; it defaults to the empty string (generally
-this should not be used unless you are familiar with the internals).
address@hidden
+
+This is used when a ``multilib'' library is being built.  Please be
+aware that multilib support @emph{will be removed} from the Automake
+core in the next major release, and then @emph{this macro will go away
+as well} (even if a ``frozen'' version of will remain available in the
address@hidden/} directory of the Automake distribution).
+
+The first optional argument is the name of the @file{Makefile} being
+generated; it defaults to @samp{Makefile}.  The second optional argument
+is used to find the top source directory; it defaults to the empty
+string (generally this should not be used unless you are familiar with
+the internals).  @xref{Multilibs}.
 
 @item AM_INIT_AUTOMAKE([OPTIONS])
 @itemx AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
@@ -10332,7 +10344,7 @@ There are a few rules and variables that didn't fit 
anywhere else.
 @menu
 * Tags::                        Interfacing to cscope, etags and mkid
 * Suffixes::                    Handling new file extensions
-* Multilibs::                   Support for multilibs.
+* Multilibs::   Support for multilibs (deprecated, soon to be removed).
 @end menu
 
 
@@ -10461,19 +10473,21 @@ Automake generate the suffix list for 
@code{.SUFFIXES}.  Any given
 by Automake generated suffixes not already in the list.
 
 @node Multilibs
address@hidden Support for Multilibs
address@hidden Support for Multilibs (deprecated, soon to be removed).
 
-Automake has support for an obscure feature called multilibs.  A
address@hidden is a library that is built for multiple different ABIs
+Automake used to support an obscure feature called multilibs.  @emph{This
+feature is now deprecated, and will be removed in the next major Automake
+version}.  Still, its implementation will remain available in the
address@hidden/} directory of the Automake distribution, so it should be
+very easy for motivated users to continue to use it in their projects,
+if they really need to.
+
+A @dfn{multilib} is a library that is built for multiple different ABIs
 at a single time; each time the library is built with a different target
 flag combination.  This is only useful when the library is intended to
 be cross-compiled, and it is almost exclusively used for compiler
 support libraries.
 
-The multilib support is still experimental.  Only use it if you are
-familiar with multilibs and can debug problems you might encounter.
-
-
 @node Include
 @chapter Include
 
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index cd57877..6835cab 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -179,7 +179,7 @@ my %_ac_macro_for_var =
    CXX => 'AC_PROG_CXX',
    CXXFLAGS => 'AC_PROG_CXX',
    F77 => 'AC_PROG_F77',
-   F77FLAGS => 'AC_PROG_F77',
+   FFLAGS => 'AC_PROG_F77',
    FC => 'AC_PROG_FC',
    FCFLAGS => 'AC_PROG_FC',
    OBJC => 'AC_PROG_OBJC',
diff --git a/m4/multi.m4 b/m4/multi.m4
index bc01dcf..bbb964f 100644
--- a/m4/multi.m4
+++ b/m4/multi.m4
@@ -1,6 +1,6 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2011,
+# 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,9 @@
 # ---------------------------------------------------
 # Add --enable-multilib to configure.
 AC_DEFUN([AM_ENABLE_MULTILIB],
+[m4_warn([obsolete], [$0 will be removed from Automake core soon.
+Files implementing the "multilib" feature are (and will remain) available
+to the 'contrib/' directory in the Automake distribution.])]dnl
 [# Default to --enable-multilib
 AC_ARG_ENABLE([multilib],
 [AS_HELP_STRING(
diff --git a/tests/multlib.test b/tests/multlib.test
index abb5a16..894effb 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2007, 2010, 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
@@ -21,6 +21,23 @@
 required='gcc GNUmake'
 . ./defs || Exit 1
 
+# Multilib support has been deprecated in the Automake core.
+
+cat >>configure.in <<'END'
+AM_ENABLE_MULTILIB([Makefile], [.])
+END
+
+$ACLOCAL
+$AUTOCONF -Wall -Werror 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep '^configure\.in:4:.*AM_ENABLE_MULTILIB.* removed.* soon' stderr
+grep '"multilib".*feature' stderr
+grep 'contrib.* in the Automake distribution' stderr
+
+rm -rf autom4te*.cache aclocal.m4 configure
+
+# Functional tests now.
+
 cat >configure.in <<'END'
 AC_INIT([multlib], [1.0])
 AC_CONFIG_SRCDIR(libfoo/foo.c)
@@ -110,16 +127,16 @@ mkdir libbar/sub
 
 cp "$am_scriptdir"/config-ml.in "$am_scriptdir"/symlink-tree .
 
-$ACLOCAL
-$AUTOCONF
+$ACLOCAL -Wno-obsolete
+$AUTOCONF -Werror -Wall -Wno-obsolete
 $AUTOMAKE --add-missing
 cd libfoo
 $ACLOCAL
-$AUTOCONF
+$AUTOCONF -Werror -Wall -Wno-obsolete
 $AUTOMAKE --add-missing
 cd ../libbar
 $ACLOCAL
-$AUTOCONF
+$AUTOCONF -Werror -Wall -Wno-obsolete
 $AUTOMAKE --add-missing
 cd ..
 


hooks/post-receive
-- 
GNU Automake