From 250218860295e517648307459a0e415b0fab32ec Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 23 Jun 2007 08:30:46 +0000 Subject: [PATCH] * aclocal.in (write_aclocal): Warn about autoconf incompatibilities instead of making them fatal. * tests/missing4.test: Adjust. * NEWS: Update. Problem reported by Bruno Haible in . --- ChangeLog | 10 ++++++++++ NEWS | 6 ++++++ aclocal.in | 7 ++++--- aclocal.m4 | 7 ++++--- tests/missing4.test | 10 ++++------ 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d9a87e..0730b31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-06-23 Paul Eggert + Ralf Wildenhues + + * aclocal.in (write_aclocal): Warn about autoconf + incompatibilities instead of making them fatal. + * tests/missing4.test: Adjust. + * NEWS: Update. + Problem reported by Bruno Haible in + . + 2007-05-03 Stepan Kasal * doc/automake.texi, lib/Automake/Rule.pm: Fix typos. diff --git a/NEWS b/NEWS index 95b6cfe..1a504a1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ New in 1.10a: +* Changes to aclocal: + + - The autoconf version check implemented by aclocal in aclocal.m4 + (and new in Automake 1.10) is degraded to a warning. This helps + in the common case where the Autoconf versions used are compatible. + * Languages changes: - subdir-object mode works now with Fortran (F77, FC, preprocessed diff --git a/aclocal.in b/aclocal.in index 3e4ab88..9847b96 100644 --- a/aclocal.in +++ b/aclocal.in @@ -783,9 +783,10 @@ sub write_aclocal ($@) # use it in the header below. autom4te will output the name of # the file in the diagnostic anyway. $output = "m4_if(m4_PACKAGE_VERSION, [$ac_version],, -[m4_fatal([this file was generated for autoconf $ac_version. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +[m4_warning([this file was generated for autoconf $ac_version. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) $output"; } diff --git a/aclocal.m4 b/aclocal.m4 index 26404ee..7ae7e5b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -12,9 +12,10 @@ # PARTICULAR PURPOSE. m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) m4_include([m4/amversion.m4]) m4_include([m4/auxdir.m4]) diff --git a/tests/missing4.test b/tests/missing4.test index 32f0fb2..42ffbf7 100755 --- a/tests/missing4.test +++ b/tests/missing4.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -42,14 +42,12 @@ mv aclocal.tmp aclocal.m4 $MAKE 2>stderr cat stderr -grep 'WARNING:.*automake.*probably too old' stderr -grep 'WARNING:.*autoconf.*probably too old' stderr -test 2 = `grep -c 'aclocal.m4:.*this file was generated for' stderr` +grep 'You have another version of autoconf' stderr +grep -c 'aclocal.m4:.*this file was generated for' stderr $MAKE 2>stderr cat stderr -grep 'WARNING:.*automake.*probably too old' stderr && exit 1 -grep 'WARNING:.*autoconf.*probably too old' stderr && exit 1 +grep 'You have another version of autoconf' stderr && exit 1 grep 'aclocal.m4:.*this file was generated for' stderr && exit 1 : -- 2.7.4