* 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 6cd5be74318dd7aba564020636c4765562f85736..3d9b385bf714ee7058c07e9e1accacf3202bd16f 100644 (file)
--- 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 2492c4a2d57973ada64927b18708a9dc1e5da2f2..2bfaa9ea84d10e296ccbd7c64fa4a9134a8fc9c3 100755 (executable)
--- 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");
+             }
          }
       }