[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-4-g444618b

[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=444618b3264dbc1efec2b02f2f3ab6d5e6fb77fe

The branch, maint has been updated
       via  444618b3264dbc1efec2b02f2f3ab6d5e6fb77fe (commit)
       via  ba5b98ffd2bd6abdb260cf4842ad9902e2ee1132 (commit)
      from  d3eaa6aa4e6f83d0fc5cf69f765ab72ddcf0ff94 (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 444618b3264dbc1efec2b02f2f3ab6d5e6fb77fe
Author: Stefano Lattarini <address@hidden>
Date:   Thu Apr 26 00:04:35 2012 +0200

    build: require autoconf 2.69
    
    It is only from version 2.69 that the 'AC_PROG_FC' macro has started to
    set the '$GFC' variable to "yes" if the selected Fortran compiler is a
    GNU compiler.  Since we use this variable in our configure.ac, we better
    require autoconf 2.69 explicitly.
    
    * configure.ac (AC_PRERQ): Require autoconf >= 2.69.
    Remove a now-obsolete "FIXME" comment.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ba5b98ffd2bd6abdb260cf4842ad9902e2ee1132
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 25 23:58:05 2012 +0200

    build: don't require minimal automake version in AM_INIT_AUTOMAKE
    
    * configure.ac (AM_INIT_AUTOMAKE): Don't explicitly require a minimal
    automake version number.  Since the Automake build system is only meant
    to work with the bleeding-edge automake, that requirement was redundant
    and misleading.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 configure.ac |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2c78288..22a158f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ([2.68])
+AC_PREREQ([2.69])
 AC_INIT([GNU Automake], [1.12.0a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
@@ -39,7 +39,7 @@ AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"])
 dnl We call AC_PROG_CC in an unusual way, and only for use in our
 dnl testsuite, so also use 'no-dependencies' and 'no-define' among
 dnl the automake options to avoid bloating and potential problems.
-AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 color-tests
+AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
                  parallel-tests silent-rules no-define no-dependencies])
 
 # The API version is the base version.  We must guarantee
@@ -299,7 +299,6 @@ _AM_COMPILER_CAN_FAIL([AC_PROG_FC(dnl
   [xlf90 f90 pgf90 pghpf epcf90 g95 gfortran])],
   [FC=false; _AM_SKIP_COMP_TESTS([Fortran])])
 
-# FIXME this won't work as expected until we can assume autoconf 2.69 :-(
 AS_IF([test x"$GFC" = x"yes"], [am_FC_is_GNU=yes], [am_FC_is_GNU=no])
 
 _AM_COMPILER_CAN_FAIL([AC_PROG_F77(dnl


hooks/post-receive
-- 
GNU Automake