* bin/autoreconf.in (autoreconf): Run automake after rerunning

aclocal.

diff --git a/ChangeLog b/ChangeLog
index 8b964a148fd89019f1f9af764cf632fed72cdaa2..f7b558b26b00bec5b306c5e4ec49463dc536d48e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-03  Andreas Schwab  <schwab@suse.de>
+
+       * bin/autoreconf.in (autoreconf): Run automake after rerunning
+       aclocal.
+
 2002-04-03  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/lang.m4 (_AC_COMPILER_OBJEXT_REJECT)

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index b4905cc67053432e51de15cf7f177db3d95764fa..befe103b58b5279517ccd94674f41565f90a804b 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -426,29 +426,12 @@ sub autoreconf ($)
     }
 
 
-  # ------------------ #
-  # Running automake.  #
-  # ------------------ #
-
-  # Assumes that there is a Makefile.am in the topmost directory.
-  if (!-f 'Makefile.am')
-    {
-      verbose "$configure_ac: not using Automake";
-    }
-  else
-    {
-      # We should always run automake, and let it decide whether it shall
-      # update the file or not.  In fact, the effect of `$force' is already
-      # included in `$automake' via `--no-force'.
-      xsystem ($automake);
-    }
-
-
   # ------------------- #
   # Rerunning aclocal.  #
   # ------------------- #
 
   # If we re-installed Libtool or Gettext, the macros might have changed.
+  # Automake also needs an up-to-date aclocal.m4.
   if ($rerun_alocal)
     {
       if (!$uses_aclocal)
@@ -465,6 +448,24 @@ sub autoreconf ($)
     }
 
 
+  # ------------------ #
+  # Running automake.  #
+  # ------------------ #
+
+  # Assumes that there is a Makefile.am in the topmost directory.
+  if (!-f 'Makefile.am')
+    {
+      verbose "$configure_ac: not using Automake";
+    }
+  else
+    {
+      # We should always run automake, and let it decide whether it shall
+      # update the file or not.  In fact, the effect of `$force' is already
+      # included in `$automake' via `--no-force'.
+      xsystem ($automake);
+    }
+
+
   # ------------------ #
   # Running autoconf.  #
   # ------------------ #