mirror of
git://git.sv.gnu.org/autoconf
synced 2024-11-27 01:49:56 +08:00
* 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.
This commit is contained in:
parent
788b2078c0
commit
fa70471557
@ -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.
|
||||
|
@ -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)
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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])
|
||||
|
Loading…
Reference in New Issue
Block a user