* 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.

diff --git a/ChangeLog b/ChangeLog
index c2b5537645233d661b7a2280dfd349099e695a3f..241decf3995d5aca4b690ea681554b5cd311b1e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-08  Akim Demaille  <akim@epita.fr>
+
+       * 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.
+
+       
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * bin/autoreconf.in: Rewrite in Perl.

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 8560d0d0fc2d1ed01431b16903e13ad185b100bf..8b0f2263cf9f40d37353e95227eda95334002533 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -45,7 +45,6 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
 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' => \@include,
-         'f|force'   => \$force,
          'W|warning' => \@warning);
 
   if (! @ARGV)

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 0203d7ba6d432e74aa355e2cbbbad8c8cd978ee7..1a1f37356ce69821304c8e4ecc4c051dad64d22a 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -275,9 +275,6 @@ my @include;
 # 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" => \@warning,
      "m|mode=s"     => \$mode,
      "M|melt"       => \$melt,

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index fe492030118e1aa44638e2ab708dae90e70e72e9..367b7f07aafba3f6bd927cf5899cdbe09f63da36 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -105,8 +105,6 @@ my $m4dir;
 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;

diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index 8a41f0230587410d29a7a751825e180f17f1c681..d59fa843df5390b31785b2e2852725b0ad3a21fa 100644 (file)
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT);
 @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 (@ISA @EXPORT);
 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)

diff --git a/man/autoconf.1 b/man/autoconf.1
index 4b3b3435bb6558b1ce44cfdc72cece60e6799b61..a9d1e896f1ac9144718a8f4b7b338e85546a6aa3 100644 (file)
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOCONF "1" "September 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOCONF "1" "October 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autoconf \- Generate configuration scripts
 .SH SYNOPSIS

diff --git a/man/autoheader.1 b/man/autoheader.1
index c47c5c49fb01514ee244d6ae80548fd62a14f0fc..392681d150e29b503bb4a814c51c54f57b6d04f4 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOHEADER "1" "September 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOHEADER "1" "October 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autoheader \- Create a template header for configure
 .SH SYNOPSIS

diff --git a/man/autom4te.1 b/man/autom4te.1
index d161a939f9fad1229b1eada473b2ffcc2f990757..8337480817bab939dcb45deb68f5bd01ccf0702d 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOM4TE "1" "September 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOM4TE "1" "October 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autom4te \- Generate files and scripts thanks to M4
 .SH SYNOPSIS

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 17b380d1f4ec39e0e5ac18da40ec92edafa5ab79..07a3e3246e34344d89dd5f3d09834b763c228579 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTORECONF "1" "September 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTORECONF "1" "October 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS
@@ -51,29 +51,13 @@ this package's Autoconf extensions
 .PP
 Unless specified, heuristics try to compute `M4DIR' from the `Makefile.am',
 or defaults to `m4' if it exists.
-.SS "The following options are passed to `automake':"
-.TP
-\fB\-\-cygnus\fR
-assume program is part of Cygnus-style tree
-.TP
-\fB\-\-foreign\fR
-set strictness to foreign
-.TP
-\fB\-\-gnits\fR
-set strictness to gnits
-.TP
-\fB\-\-gnu\fR
-set strictness to gnu
-.TP
-\fB\-\-include\-deps\fR
-include generated dependencies in Makefile.in
 .PP
 The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL
 are honored.
 .SH AUTHOR
-Written by David J. MacKenzie.
+Written by David J. MacKenzie and Akim Demaille.
 .PP
-Copyright 1994, 1999, 2000 Free Software Foundation, Inc.
+Copyright 1994, 1999, 2000, 2001 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "REPORTING BUGS"

diff --git a/man/autoscan.1 b/man/autoscan.1
index eb005543b8ff091eb8f7c6ddc865389dc5dd60e3..59fea8e0c2990e7584bb24091fc7fa65695ee45e 100644 (file)
--- a/man/autoscan.1
+++ b/man/autoscan.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOSCAN "1" "September 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOSCAN "1" "October 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autoscan \- Generate a preliminary configure.in
 .SH SYNOPSIS

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index 2d4073b858a354d4032af8864a426f37b2ab1bc9..ee1477c4f2294e6c4c554d0b91c9db224ba296fd 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOUPDATE "1" "September 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOUPDATE "1" "October 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf
 .SH SYNOPSIS

diff --git a/man/ifnames.1 b/man/ifnames.1
index bc39a92dc77e4d3a611a92a85b74036d3c870411..277571e00057e6ca30f1b640b55e37d8b81a8223 100644 (file)
--- a/man/ifnames.1
+++ b/man/ifnames.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH IFNAMES "1" "September 2001" "ifnames " FSF
+.TH IFNAMES "1" "October 2001" "ifnames " FSF
 .SH NAME
 ifnames \- Extract CPP conditionals from a set of files
 .SH SYNOPSIS

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b889a3a743d0ae5001a7bee0cbcfb0ad5c15c87d..ac16a9ac07127c044d2ef94a8f6f97e1741dba5f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -128,8 +128,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = autoconf autoheader autom4te autoreconf autoscan \
        autoupdate ifnames
 DIST_SOURCES =
-DIST_COMMON = README Makefile.am Makefile.in autom4te.in autoreconf.in \
-       autoupdate.in wrappl.in wrapsh.in
+DIST_COMMON = Makefile.am Makefile.in autom4te.in autoupdate.in \
+       wrappl.in wrapsh.in
 all: all-am
 
 .SUFFIXES:
@@ -146,8 +146,8 @@ autoheader: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@:tests/wrappl.in CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 autom4te: $(top_builddir)/config.status autom4te.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
-autoreconf: $(top_builddir)/config.status autoreconf.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+autoreconf: $(top_builddir)/config.status wrappl.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@:tests/wrappl.in CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 autoscan: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@:tests/wrappl.in CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 autoupdate: $(top_builddir)/config.status autoupdate.in

diff --git a/tests/tools.at b/tests/tools.at
index c7b5c432e9503c8248d614c5ef529b18470a8338..cd6cdf01092e6b2acddfd4e7c107e09b79d0f6c6 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -74,7 +74,6 @@ AT_CHECK([/bin/sh ./syntax.sh])
 # 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])