fix for --no-force

diff --git a/ChangeLog b/ChangeLog
index a8794234e2aef7c343fd2f9c42df2f7f6b091839..870262a463ebd0a3e8f3370ab8612d70e2d98e07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon May 26 22:50:49 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (generate_makefile): If --no-force, check
+       Makefile.in against configure.in and aclocal.m4.
+
        * automake.in (handle_dist_worker): Put --include-deps on command
        line if specified originally.
        (handle_configure): Likewise.

diff --git a/automake.in b/automake.in
index 5e2b47f2375f4a9ccc1128ce2ef6fe920a86e7b3..7192ecd8d47a3db0a08133de56dfffaa7d927336 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -572,12 +572,19 @@ sub generate_makefile
     {
        local ($am_time) = (stat ($makefile . '.am'))[9];
        local ($in_time) = (stat ($out_file))[9];
+       # FIXME: should cache these times.
+       local ($conf_time) = (stat ('configure.in'))[9];
        # FIXME: how to do unsigned comparison?
-       if ($am_time < $in_time)
+       if ($am_time < $in_time || $am_time < $conf_time)
        {
            # No need to update.
            return;
        }
+       if (-f 'aclocal.m4')
+       {
+           local ($acl_time) = (stat _)[9];
+           return if ($am_time < $acl_time);
+       }
     }
 
     if (! open (GM_FILE, "> " . $out_file))