From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 14 Oct 2006 17:40:25 +0000 (+0000)
Subject: * aclocal.in (write_aclocal): Improve warning for mismatched
X-Git-Tag: Release-1-10~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e90cf137a00e5ec04bfc33b2a92e0ceb76c4fd2f;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index 823dc14d6..431b76da1 100644
--- 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 5cc280f9f..3e4ab885d 100644
--- 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 d5f9e1688..177657f7d 100644
--- 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])