From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 6 Feb 2003 16:52:36 +0000 (+0000)
Subject: * automake.in (scan_autoconf_files): Don't complain that
X-Git-Tag: Release-1-7-2b~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5ead5ab8f455099fe60b8174f5b559bcdc52620;p=thirdparty%2Fautomake.git

* automake.in (scan_autoconf_files): Don't complain that
AM_INIT_AUTOMAKE comes from an old version if it was not found.
---

diff --git a/ChangeLog b/ChangeLog
index 6cd5be743..3d9b385bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-06  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (scan_autoconf_files): Don't complain that
+	AM_INIT_AUTOMAKE comes from an old version if it was not found.
+
 2003-02-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* automake.in (am_install_var): Simplify filtering of
diff --git a/automake.in b/automake.in
index 2492c4a2d..2bfaa9ea8 100755
--- a/automake.in
+++ b/automake.in
@@ -5381,25 +5381,29 @@ sub scan_autoconf_files
 
     @configure_input_files = sort keys %make_list;
 
-    err_ac "`AM_INIT_AUTOMAKE' must be used"
-      if ! $seen_init_automake;
-
-    if (! $seen_automake_version)
+    if (! $seen_init_automake)
       {
-	if (-f 'aclocal.m4')
-	  {
-	    error ($seen_init_automake || $me,
-		   "your implementation of AM_INIT_AUTOMAKE comes from " .
-		   "an\nold Automake version.  You should recreate " .
-		   "aclocal.m4\nwith aclocal and run automake again.\n");
-	  }
-	else
+	err_ac "`AM_INIT_AUTOMAKE' must be used";
+      }
+    else
+      {
+	if (! $seen_automake_version)
 	  {
-	    error ($seen_init_automake || $me,
-		   "no proper implementation of AM_INIT_AUTOMAKE was " .
-		   "found,\nprobably because aclocal.m4 is missing...\n" .
-		   "You should run aclocal to create this file, then\n" .
-		   "run automake again.\n");
+	    if (-f 'aclocal.m4')
+	      {
+		error ($seen_init_automake,
+		       "your implementation of AM_INIT_AUTOMAKE comes from " .
+		       "an\nold Automake version.  You should recreate " .
+		       "aclocal.m4\nwith aclocal and run automake again.\n");
+	      }
+	    else
+	      {
+		error ($seen_init_automake,
+		       "no proper implementation of AM_INIT_AUTOMAKE was " .
+		       "found,\nprobably because aclocal.m4 is missing...\n" .
+		       "You should run aclocal to create this file, then\n" .
+		       "run automake again.\n");
+	      }
 	  }
       }