27-fyi-general-force.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * tests/tools.at (AT_CHECK_PERL_SYNTAX): Check autoreconf.
        (Syntax of the shell scripts): Don't.
        * bin/autoheader.in, bin/autom4te.in, bin/autoreconf.in: Don't
        bother with $force since...
        * lib/Autom4te/General.pm: does.
        
        
Index: bin/autoheader.in
--- bin/autoheader.in Sun, 23 Sep 2001 08:45:24 +0200 akim
+++ bin/autoheader.in Mon, 08 Oct 2001 01:35:51 +0200 akim
@@ -45,7 +45,6 @@
 local $config_h;
 my $config_h_in;
 my $localdir = '.';
-my $force = 0;
 my @include;
 my @warning;
 # m4.
@@ -107,7 +106,6 @@ sub parse_args ()
   my $srcdir;
 
   getopt ('I|include|A|autoconf-dir|m|macrodir|l|localdir=s' => address@hidden,
-         'f|force'   => \$force,
          'W|warning' => address@hidden);
 
   if (! @ARGV)
Index: bin/autom4te.in
--- bin/autom4te.in Mon, 08 Oct 2001 01:32:01 +0200 akim
+++ bin/autom4te.in Mon, 08 Oct 2001 01:34:13 +0200 akim
@@ -275,9 +275,6 @@ sub load
 # 0 for EXIT_SUCCESS.
 my $exit_status = 0;
 
-# If true, don't rely on the cache (but still update it).
-my $force = 0;
-
 # $M4.
 my $m4 = $ENV{"M4"} || '@M4@';
 # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
@@ -487,7 +484,6 @@ sub parse_args ()
      # Operation modes:
      "o|output=s"   => \$output,
      "normalize"    => \$normalize,
-     "f|force"      => \$force,
      "W|warnings=s" => address@hidden,
      "m|mode=s"     => \$mode,
      "M|melt"       => \$melt,
Index: bin/autoreconf.in
--- bin/autoreconf.in Mon, 08 Oct 2001 01:32:01 +0200 akim
+++ bin/autoreconf.in Mon, 08 Oct 2001 01:33:56 +0200 akim
@@ -105,8 +105,6 @@
 my $status = 0;
 # symlink -- when --install, use symlinks instead.
 my $symlink = 0;
-# $force -- update up to date files.
-my $force = 0;
 
 
 ## ---------- ##
@@ -124,7 +122,6 @@ sub parse_args ()
   getopt ('l|localdir=s'                => \$localdir,
          'A|autoconf-dir|m|macrodir=s' => \$autoconf_dir,
          'M|m4dir=s'                   => \$m4dir,
-         'f|force'                     => \$force,
          'i|install'                   => \$install,
          's|symlink'                   => \$symlink);
 
@@ -215,8 +212,7 @@ sub autoreconf ()
   # ----------------- #
 
   if (-f "$localdir/aclocal.m4" &&
-      ($force ||
-       !up_to_date_p ("$localdir/aclocal.m4", "$localdir/acinclude.m4")))
+      !up_to_date_p ("$localdir/aclocal.m4", "$localdir/acinclude.m4"))
     {
       # If there are flags for aclocal in Makefile.am, use them.
       my $aclocal_flags;
Index: lib/Autom4te/General.pm
--- lib/Autom4te/General.pm Mon, 08 Oct 2001 01:32:01 +0200 akim
+++ lib/Autom4te/General.pm Mon, 08 Oct 2001 01:35:05 +0200 akim
@@ -31,7 +31,7 @@
 @ISA = qw (Exporter);
 @EXPORT = qw (&debug &find_configure_ac &find_file &getopt &mktmpdir &mtime
               &uniq &update_file &up_to_date_p &verbose &xsystem
-             $debug $help $me $tmp $verbose $version);
+             $debug $force $help $me $tmp $verbose $version);
 
 # Variable we share with the main package.  Be sure to have a single
 # copy of them: using `my' together with multiple inclusion of this
@@ -39,6 +39,10 @@
 use vars qw ($debug);
 $debug = 0;
 
+# Recreate all the files, or consider all the output files are obsolete.
+use vars qw ($force);
+$force = undef;
+
 use vars qw ($help);
 $help = undef;
 
@@ -188,6 +192,7 @@ sub getopt (%)
 
              "v|verbose"    => \$verbose,
              "d|debug"      => \$debug,
+            'f|force'      => \$force,
            );
   Getopt::Long::Configure ("bundling");
   GetOptions (%option)
Index: tests/tools.at
--- tests/tools.at Sun, 07 Oct 2001 23:18:44 +0200 akim
+++ tests/tools.at Mon, 08 Oct 2001 01:36:42 +0200 akim
@@ -74,7 +74,6 @@
 # running `sh PROG'.
 
 AT_CHECK([/bin/sh -n ../bin/autoconf],   0)
-AT_CHECK([/bin/sh -n ../bin/autoreconf], 0)
 
 # These are not built, they are in the src tree.
 AT_CHECK([/bin/sh -n $top_srcdir/config/install-sh], 0)
@@ -102,6 +101,7 @@ m4_define([AT_CHECK_PERL_SYNTAX],
 
 AT_CHECK_PERL_SYNTAX([autoheader])
 AT_CHECK_PERL_SYNTAX([autom4te])
+AT_CHECK_PERL_SYNTAX([autoreconf])
 AT_CHECK_PERL_SYNTAX([autoscan])
 AT_CHECK_PERL_SYNTAX([autoupdate])
 AT_CHECK_PERL_SYNTAX([ifnames])