* aclocal.in (write_aclocal): Improve warning for mismatched

Autoconf version.

diff --git a/ChangeLog b/ChangeLog
index 823dc14d60c0b05ffad35589e211851530b2cfec..431b76da1cdf9230920470a40a6f17b6c76a1ca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * aclocal.in (write_aclocal): Improve warning for mismatched
+       Autoconf version.
+
        * automake.in: For preprocessed assembler, add `$(DEFS)
        $(DEFAULT_INCLUDES) $(INCLUDES)' to the compile rule.
        * doc/automake.texi (Assembly Support): Update.

diff --git a/aclocal.in b/aclocal.in
index 5cc280f9fe57ca8867793fddfd5ef81a46aee9e2..3e4ab885dd76cdc62d5bfde9c78709acb6f258e4 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -783,7 +783,9 @@ 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], [63])])
+[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])])
 
 $output";
     }

diff --git a/aclocal.m4 b/aclocal.m4
index d5f9e1688d0750c89590c641f5494078cc16f153..177657f7da708b6b3ca4b6ebd6cec7cbf6e4a166 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -12,7 +12,9 @@
 # PARTICULAR PURPOSE.
 
 m4_if(m4_PACKAGE_VERSION, [2.60],,
-[m4_fatal([this file was generated for autoconf 2.60], [63])])
+[m4_fatal([this file was generated for autoconf 2.60.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
 m4_include([m4/amversion.m4])
 m4_include([m4/auxdir.m4])