From: Akim Demaille <akim@epita.fr>
Date: Wed, 24 Apr 2002 16:28:39 +0000 (+0000)
Subject: * bin/autoreconf.in (autoreconf): Run automake after autoconf and
X-Git-Tag: AUTOCONF-2.53b~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f401af795db8f2f434da94770d27e508c4ebee2c;p=thirdparty%2Fautoconf.git

* bin/autoreconf.in (autoreconf): Run automake after autoconf and
autoheader, so that automake does not complain about a missing
config.h.in that was to be created.
---

diff --git a/ChangeLog b/ChangeLog
index 3f5787b3c..b0ae74474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-24  Akim Demaille  <akim@epita.fr>
+
+	* bin/autoreconf.in (autoreconf): Run automake after autoconf and
+	autoheader, so that automake does not complain about a missing
+	config.h.in that was to be created.
+
 2002-04-23  Akim Demaille  <akim@epita.fr>
 
 	* bin/autoheader.in (parse_args): --warning takes an argument.
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 2b75bfb09..6c5e1624e 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -448,30 +448,17 @@ 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.  #
   # ------------------ #
 
-  # Don't try to be smarter than `autoconf', which does its own
-  # up to date checks.
+  # Don't try to be smarter than `autoconf', which does its own up to
+  # date checks.
+  #
+  # We prefer running autoconf before autoheader, because (i) the
+  # latter runs the former, and (ii) autoconf is stricter than
+  # autoheader.  So all in all, autoconf should give better error
+  # messages.
   xsystem ($autoconf);
 
 
@@ -481,7 +468,12 @@ sub autoreconf ($)
 
   # We now consider that if AC_CONFIG_HEADERS is used, then autoheader
   # is used too.
-  # Just as for autoconf, up to date ness is performed by the tool itself.
+  #
+  # Just as for autoconf, up to date ness is performed by the tool
+  # itself.
+  #
+  # Run it before automake, since the latter checks the presence of
+  # config.h.in when it sees an AC_CONFIG_HEADERS.
   if (!$uses_autoheader)
     {
       verbose "$configure_ac: not using Autoheader";
@@ -491,6 +483,24 @@ sub autoreconf ($)
       xsystem ($autoheader);
     }
 
+
+  # ------------------ #
+  # 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);
+    }
+
   chdir $cwd
     or die "$me: cannot chdir to $cwd: $!\n";
 }