+2001-11-03 Akim Demaille <akim@epita.fr>
+
+ * lib/Autom4te/General.pm: (&catfile, &canonfile)
+ (&file_name_is_absolute): New, wrappers around routines from
+ File::Spec.
+ Use and export them.
+ (&find_configure_ac): Optionally take a directory where to look at.
+ * bin/autoreconf.in (&parse_args): Trim the configure.ac part of
+ the arguments.
+ Default @ARGV to `.', not find_configure_ac.
+ (&autoreconf): Argument is a directory.
+ Trace AC_CONFIG_SUBDIRS and schedule the subdirs for autoreconf'ing.
+ * doc/autoconf.texi (autoreconf Invocation): Update.
+
2001-11-03 Akim Demaille <akim@epita.fr>
* lib/Autom4te/General.pm (@export_vars, @export_subs)
Runs gettextize and libtoolize when appropriate.
- autoreconf
--m4dir is no longer supported.
+- autoreconf
+ Now runs only in the specified directories, defaulting to `.',
+ but understands AC_CONFIG_SUBDIRS for dependent directories.
+ Before, it used to run on all the `configure.ac' found in the
+ current tree.
+ Independent packages are properly updated.
** Bug fixes
------------------------------------------------------------------------------
-autoreconf doesn't support having (in the same tree) both directories
-that are parts of a larger package (sharing aclocal.m4 and
-acconfig.h), and directories that are independent packages (each with
-their own ac*). It assumes that they are all part of the same
-package, if you use --localdir, or that each directory is a separate
-package, if you don't use it.
-
-autoreconf should automatically figure out which ac* files to use--the
-closest ones up the tree from each directory, probably, unless
-overridden by --localdir.
-
-Also, autoreconf recurses on all subdirectories containing a
-configure.in, not just those given by an AC_CONFIG_SUBDIRS directive.
-This may not be a problem in practice.
-
-------------------------------------------------------------------------------
-
Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software
Foundation, Inc.
# $HELP
# -----
-$help = "Usage: $0 [OPTION] ... [CONFIGURE-AC] ...
+$help = "Usage: $0 [OPTION] ... [CONFIGURE-AC or DIRECTORY] ...
Run `autoconf' (and `autoheader', `aclocal', `automake', `gettextize',
and `libtoolize' where appropriate) repeatedly to remake the GNU Build
-System files in the directory tree driven by CONFIGURE-AC (defaulting
-to `./configure.ac').
+System files in the DIRECTORIES or the directory trees driven by
+CONFIGURE-AC (defaulting to `.').
By default, it only remakes those files that are older than their
predecessors. If you install new versions of the GNU Build System,
'i|install' => \$install,
's|symlink' => \$symlink);
- push @ARGV, find_configure_ac
- unless @ARGV;
+ # Even if the user specified a configure.ac, trim to get the
+ # directory, and look for configure.ac again. Because (i) the code
+ # is simpler, and (ii) we are still able to diagnose simultaneous
+ # presence of configure.ac and configure.in.
+ @ARGV = map { /configure\.(ac|in)$/ ? dirname ($_) : $_ } @ARGV;
+ push @ARGV, '.' unless @ARGV;
if ($verbose && $debug)
{
}
-# &autoreconf ($CONFIGURE_AC_PATH)
-# --------------------------------
-# Reconf the directory of $CONFIGURE_AC_PATH.
+# &autoreconf ($DIRECTORY)
+# ------------------------
+# Reconf the $DIRECTORY.
sub autoreconf ($)
{
- my ($configure_ac_path) = @_;
- my ($configure_ac, $subdir) = fileparse ($configure_ac_path);
- verbose "working in $subdir, on $configure_ac";
- chdir $subdir
- or die "$me: cannot chdir to $subdir: $!\n";
+ my ($directory) = @_;
+ verbose "working in `$directory'";
+ chdir $directory
+ or die "$me: cannot chdir to $directory: $!\n";
+
+ my $configure_ac = find_configure_ac;
+ die "$me: cannot find `configure.ac' in `$directory'\n"
+ unless $configure_ac;
# ---------------------- #
# Is it using Autoconf? #
my $uses_libtool;
my $uses_autoheader;
my $uses_aclocal;
+ my @subdir;
my $traces = new Autom4te::XFile
("$autoconf"
. join (' --trace=', '',
'AC_INIT', 'AM_GNU_GETTEXT', 'AM_PROG_LIBTOOL',
- 'AC_CONFIG_HEADERS')
- . " |");
+ 'AC_CONFIG_HEADERS',
+ 'AC_CONFIG_SUBDIRS:AC_CONFIG_SUBDIRS:\$1')
+ . ' |');
while ($_ = $traces->getline)
{
- $uses_autoconf = 1 if /AC_INIT/;
- $uses_gettext = 1 if /AM_GNU_GETTEXT/;
- $uses_libtool = 1 if /AM_PROG_LIBTOOL/;
- $uses_autoheader = 1 if /AC_CONFIG_HEADERS/;
+ $uses_autoconf = 1 if /AC_INIT/;
+ $uses_gettext = 1 if /AM_GNU_GETTEXT/;
+ $uses_libtool = 1 if /AM_PROG_LIBTOOL/;
+ $uses_autoheader = 1 if /AC_CONFIG_HEADERS/;
+ push @ARGV, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/;
}
# Autoreconf all the given configure.ac. A while loop, not a for,
# since the list can change at runtime because of AC_CONFIG_SUBDIRS.
+print STDERR "@ARGV\n";
autoreconf (shift @ARGV)
while (@ARGV);
@node autoreconf Invocation
@section Using @code{autoreconf} to Update @code{configure} Scripts
-@cindex @code{autoreconf}
-
-@c FIXME: Now completely outdated.
-
-If you have a lot of Autoconf-generated @code{configure} scripts, the
-@code{autoreconf} program can save you some work. It runs
-@code{autoconf} (and @code{autoheader}, where appropriate) repeatedly to
-remake the Autoconf @code{configure} scripts and configuration header
-templates in the directory tree rooted at the current directory. By
-default, it only remakes those files that are older than their
-@file{configure.ac} or (if present) @file{aclocal.m4}. Since
-@code{autoheader} does not change the timestamp of its output file if
-the file wouldn't be changing, this is not necessarily the minimum
-amount of work. If you install a new version of Autoconf, you can make
-@code{autoreconf} remake @emph{all} of the files by giving it the
+@cindex @command{autoreconf}
+
+Installing the various components of the @sc{gnu} Build System can be
+tedious: running @command{gettextize}, @command{automake} etc. in each
+directory. It may be needed either because some tools such as
+@command{automake} have been updated on your system, or because some of
+the sources such as @file{configure.ac} have been updated, or finally,
+simply in order to install the @sc{gnu} Build System in a fresh tree.
+
+It runs @command{autoconf}, @command{autoheader}, @command{aclocal},
+@command{automake}, @command{libtoolize}, and @command{gettextize} (when
+appropriate) repeatedly to update the @sc{gnu} Build System in specified
+directories, and their subdirectories (@pxref{Subdirectories}). By
+default, it only remakes those files that are older than their sources.
+
+If you install a new version of some tools, you can make
+@command{autoreconf} remake @emph{all} of the files by giving it the
@option{--force} option.
-If you give @code{autoreconf} the @option{--autoconf-dir=@var{dir}} or
-@option{--localdir=@var{dir}} options, it passes them down to
-@code{autoconf} and @code{autoheader} (with relative paths adjusted
-properly).
-
-@code{autoreconf} does not support having, in the same directory tree,
-both directories that are parts of a larger package (sharing
-@file{aclocal.m4} and @file{acconfig.h}) and directories that are
-independent packages (each with their own @file{aclocal.m4} and
-@file{acconfig.h}). It assumes that they are all part of the same
-package if you use @option{--localdir}, or that each directory is a
-separate package if you don't use it. This restriction may be removed
-in the future.
-
@xref{Automatic Remaking}, for @file{Makefile} rules to automatically
remake @code{configure} scripts when their source files change. That
method handles the timestamps of configuration header templates
@option{--localdir=@var{dir}}.
@noindent
-@code{autoreconf} accepts the following options:
+@command{autoreconf} accepts the following options:
@table @option
@item --help
use 5.005_03;
use Exporter;
use File::Basename;
+use File::Spec;
use File::stat;
use IO::File;
use Carp;
# Functions we define and export.
my @export_subs =
- qw (&backname &debug &find_configure_ac &find_file
+ qw (&backname &catfile &canonpath &debug
+ &file_name_is_absolute &find_configure_ac &find_file
&getopt &mktmpdir &mtime
&uniq &update_file &up_to_date_p &verbose &xsystem);
# Works with non strictly increasing paths, i.e., `src/../lib' => `..'.
sub backname ($)
{
- use File::Spec;
-
my ($file) = @_;
my $underscore = $_;
my @res;
}
$_ = $underscore;
- return File::Spec->canonpath (File::Spec->catfile (@res))
+ return canonpath (catfile (@res))
+}
+
+
+# $FILE
+# &catfile (@COMPONENT)
+# ---------------------
+sub catfile (@)
+{
+ my (@component) = @_;
+ return File::Spec->catfile (@component);
+}
+
+
+# $FILE
+# &canonpath ($FILE)
+# ------------------
+sub canonpath ($)
+{
+ my ($file) = @_;
+ return File::Spec->canonpath ($file);
}
}
+# $BOOLEAN
+# &file_name_is_absolute ($FILE)
+# ------------------------------
+sub file_name_is_absolute ($)
+{
+ my ($file) = @_;
+ return File::Spec->file_name_is_absolute ($file);
+}
+
+
# $CONFIGURE_AC
-# &find_configure_ac ()
-# ---------------------
-sub find_configure_ac ()
+# &find_configure_ac ([$DIRECTORY = `.'])
+# ---------------------------------------
+sub find_configure_ac (;$)
{
- if (-f 'configure.ac')
+ my ($directory) = @_;
+ $directory ||= '.';
+ my $configure_ac = canonpath (catfile ($directory, 'configure.ac'));
+ my $configure_in = canonpath (catfile ($directory, 'configure.in'));
+
+ if (-f $configure_ac)
{
- if (-f 'configure.in')
+ if (-f $configure_in)
{
- carp "warning: `configure.ac' and `configure.in' both present.\n";
- carp "warning: proceeding with `configure.ac'.\n";
+ carp "$me: warning: `$configure_ac' and `$configure_in' both present.\n";
+ carp "$me: warning: proceeding with `$configure_ac'.\n";
}
- return 'configure.ac';
+ return $configure_ac;
}
- elsif (-f 'configure.in')
+ elsif (-f $configure_in)
{
- return 'configure.in';
+ return $configure_in;
}
return;
}
# if absent.
sub find_file ($@)
{
- use File::Spec;
-
my ($filename, @include) = @_;
my $optional = 0;
$optional = 1
if $filename =~ s/\?$//;
- return File::Spec->canonpath ($filename)
+ return canonpath ($filename)
if -e $filename;
- if (File::Spec->file_name_is_absolute ($filename))
+ if (file_name_is_absolute ($filename))
{
die "$me: no such file or directory: $filename\n"
unless $optional;
foreach my $path (reverse @include)
{
- return File::Spec->canonpath (File::Spec->catfile ($path, $filename))
- if -e File::Spec->catfile ($path, $filename)
+ return canonpath (catfile ($path, $filename))
+ if -e catfile ($path, $filename);
}
die "$me: no such file or directory: $filename\n"
GetOptions (%option)
or exit 1;
- push @ARGV, '-'
+ push @ARGV, '-'
if $stdin;
}
autoreconf \- Update generated configuration files
.SH SYNOPSIS
.B autoreconf
-[\fIOPTION\fR] ... [\fICONFIGURE-AC\fR] ...
+[\fIOPTION\fR] ... [\fICONFIGURE-AC or DIRECTORY\fR] ...
.SH DESCRIPTION
Run `autoconf' (and `autoheader', `aclocal', `automake', `gettextize',
and `libtoolize' where appropriate) repeatedly to remake the GNU Build
-System files in the directory tree driven by CONFIGURE-AC (defaulting
-to `./configure.ac').
+System files in the DIRECTORIES or the directory trees driven by
+CONFIGURE-AC (defaulting to `.').
.PP
By default, it only remakes those files that are older than their
predecessors. If you install new versions of the GNU Build System,
projects / thirdparty / autoconf.git / commitdiff
