Re: automatic update Makefile.am -> Makefile.in -> Makefile no longer working

[Ralf Wildenhues]

* Paul Eggert wrote on Thu, Jun 21, 2007 at 09:15:56PM CEST:
> Ralf Wildenhues <address@hidden> writes:
> 
> > I think this should be applied to HEAD and branch-1-10.
> > Would you like me to do it?
> 
> Yes, please.  And thanks for your review; your points all look right
> to me.

Thanks.  This is what I installed.

Cheers,
Ralf

2007-06-23  Paul Eggert  <address@hidden>
            Ralf Wildenhues  <address@hidden>

        * 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
        <http://lists.gnu.org/archive/html/bug-automake/2007-06/msg00010.html>.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.326
diff -u -r1.326 NEWS
--- NEWS        29 Mar 2007 23:01:59 -0000      1.326
+++ NEWS        22 Jun 2007 08:32:17 -0000
@@ -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
Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.140
diff -u -r1.140 aclocal.in
--- aclocal.in  14 Oct 2006 17:40:25 -0000      1.140
+++ aclocal.in  22 Jun 2007 08:32:17 -0000
@@ -783,9 +783,10 @@
       # 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";
     }
Index: tests/missing4.test
===================================================================
RCS file: /cvs/automake/automake/tests/missing4.test,v
retrieving revision 1.1
diff -u -r1.1 missing4.test
--- tests/missing4.test 21 Apr 2006 19:02:29 -0000      1.1
+++ tests/missing4.test 22 Jun 2007 08:32:18 -0000
@@ -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 @@
 
 $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
 
 :