* bin/autom4te.in: With --force, always refresh the output

file.

diff --git a/ChangeLog b/ChangeLog
index 806ebf3c8b25a644bb327a7d353371b6ced98bf0..e8057c553f7778a15f1f297be66ec41d8c4ce4e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24  Stepan Kasal  <kasal@ucw.cz>
+
+       * bin/autom4te.in: With --force, always refresh the output
+       file.
+
 2006-10-24  Stepan Kasal  <kasal@ucw.cz>
 
        * bin/autoconf.as: Fix the verbose message at the end.

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 87d2c5f48796da7eb3d5e7baa9545f7b19e45d00..0807cd14ed331d2492e5abe0a73a91fe79518230 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -987,7 +987,7 @@ $req->valid (0)
 # We now know whether we can trust the Request object.  Say it.
 verb "the trace request object is:\n" . $req->marshall;
 
-# We need to run M4 if (i) the users wants it (--force), (ii) $REQ is
+# We need to run M4 if (i) the user wants it (--force), (ii) $REQ is
 # invalid.
 handle_m4 ($req, keys %{$req->macro})
   if $force || ! $req->valid;
@@ -1026,10 +1026,10 @@ if (%trace)
   }
 else
   {
-    # Actual M4 expansion, only if $output is too old. STDOUT is
-    # pretty old.
+    # Actual M4 expansion, if the user wants it, or if $output is old
+    # (STDOUT is pretty old).
     handle_output ($req, $output)
-      if mtime ($output) < mtime ($ocache . $req->id);
+      if $force || mtime ($output) < mtime ($ocache . $req->id);
   }
 
 # If we ran up to here, the cache is valid.