From: Akim Demaille Date: Mon, 8 Oct 2001 08:26:58 +0000 (+0000) Subject: * doc/autoconf.texi (autoreconf Invocation): Adjust. X-Git-Tag: AUTOCONF-2.52f~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abeb5bf977bfe354d33f8390af2e75abb00c50e4;p=thirdparty%2Fautoconf.git * doc/autoconf.texi (autoreconf Invocation): Adjust. * bin/autoreconf.in (autoreconf): Run gettextize when appropriate. --- diff --git a/ChangeLog b/ChangeLog index 241decf39..98eac8dfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-10-08 Akim Demaille + + * doc/autoconf.texi (autoreconf Invocation): Adjust. + * bin/autoreconf.in (autoreconf): Run gettextize when appropriate. + + 2001-10-08 Akim Demaille * tests/tools.at (AT_CHECK_PERL_SYNTAX): Check autoreconf. diff --git a/NEWS b/NEWS index bdf98bd90..dbef94b06 100644 --- a/NEWS +++ b/NEWS @@ -26,16 +26,19 @@ ** Emacs Autoconf and Autotest modes are provided. -** autom4te - New executable, used by the Autoconf suite to cache and speed up - most processing. - -** Standardization of the executables interface +** Executables +- autom4te + New, used by the Autoconf suite to cache and speed up most processing. - --force, -f Supported by autom4te, autoconf and autoheader. - --include, -I Replaces --autoconf-dir and --localdir in autoconf, autoheader and autoupdate. +- autoreconf + No longer passes --cygnus, --foreign, --gnits, --gnu, --include-deps: + automake options are to be given via AUTOMAKE_OPTIONS. +- autoreconf + Runs gettextize when appropriate. ** Bug fixes - The top level $prefix is propagated to the AC_CONFIG_SUBDIRS configures. diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 367b7f07a..885dbf431 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -45,12 +45,12 @@ use strict; # ----- $help = "Usage: $0 [OPTION] ... [TEMPLATE-FILE] -Run `autoconf' (and `autoheader', `aclocal' and `automake', where -appropriate) repeatedly to remake the Autoconf `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 predecessors. If you install a new version of -Autoconf, running `autoreconf' remakes all of the files by giving it +Run `autoconf' (and `autoheader', `aclocal', `automake' and +`gettextize', where appropriate) repeatedly to remake the GNU Build +System files in the directory tree rooted at the current directory. +By default, it only remakes those files that are older than their +predecessors. If you install a new version of GNU Build System +components, running `autoreconf' remakes all of the files by giving it the `--force' option. Operation modes: @@ -94,6 +94,7 @@ my $autoconf = $ENV{'AUTOCONF'} || '@autoconf-name@'; my $autoheader = $ENV{'AUTOHEADER'} || '@autoheader-name@'; my $automake = $ENV{'AUTOMAKE'} || 'automake'; my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; +my $gettextize = $ENV{'GETTEXTIZE'} || 'gettexize'; # --install -- as --add-missing in other tools. @@ -149,6 +150,7 @@ sub parse_args () { $autoconf .= ' --force'; $autoheader .= ' --force'; + $gettextize .= ' --force'; } else { @@ -167,6 +169,7 @@ sub parse_args () { $autoconf .= ' --debug'; $autoheader .= ' --debug'; + $automake .= ' --verbose'; } # --install and --symlink; if ($install) @@ -174,6 +177,8 @@ sub parse_args () $automake .= ' --add-missing'; $automake .= ' --copy' unless $symlink; + $gettextize .= ' --copy' + unless $symlink; } } @@ -195,18 +200,39 @@ sub autoreconf () # If there is no AC_INIT, then we are not interested: it looks like # a Cygnus thingy. my $configure_ac_file = new Autom4te::XFile $configure_ac; - my $autoconf_driven; + my $uses_autoconf; while ($_ = $configure_ac_file->getline) { - $autoconf_driven = 1 + $uses_autoconf = 1 if /AC_INIT/; } - if (!$autoconf_driven) + if (!$uses_autoconf) { verbose "$configure_ac: not Autoconf"; return; } + # -------------------- # + # Running gettexitze. # + # -------------------- # + + my $uses_gettext = 0; + my $traces = new Autom4te::XFile "$autoconf --trace=AM_GNU_GETTEXT |"; + while ($_ = $traces->getline) + { + $uses_gettext = 1 + if /AM_GNU_GETTEXT/; + } + if (!$uses_gettext) + { + verbose "$configure_ac: not Gettext"; + } + else + { + xsystem ($gettextize); + } + + # ----------------- # # Running aclocal. # # ----------------- # @@ -270,14 +296,14 @@ sub autoreconf () # We now consider that if AC_CONFIG_HEADERS is used, then autoheader # is used too. # Just as for autoconf, up to date ness is performed by the tool itself. - my $autoheader_driven = 0; + my $uses_autoheader = 0; my $traces = new Autom4te::XFile "$autoconf --trace=AC_CONFIG_HEADERS |"; while ($_ = $traces->getline) { - $autoheader_driven = 1 + $uses_autoheader = 1 if /AC_CONFIG_HEADERS/; } - if (!$autoheader_driven) + if (!$uses_autoheader) { verbose "$configure_ac: not Autoheader"; } diff --git a/doc/autoconf.texi b/doc/autoconf.texi index f25fbfada..4ffb05c12 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -1463,26 +1463,6 @@ plays with different versions of Autoconf simultaneously. Specify location of additional macro files (@file{m4} by default). @end table -Additionally, the following options are recognized and passed to -@code{automake}: - -@table @option -@item --cygnus -Assume program is part of Cygnus-style tree. - -@item --foreign -Set strictness to foreign. - -@item --gnits -Set strictness to gnits. - -@item --gnu -Set strictness to gnu. - -@item --include-deps -Include generated dependencies in @file{Makefile.in}. -@end table - @c ========================================= Initialization and Output Files. diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 07a3e3246..961ffb466 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -6,12 +6,12 @@ autoreconf \- Update generated configuration files .B autoreconf [\fIOPTION\fR] ... [\fITEMPLATE-FILE\fR] .SH DESCRIPTION -Run `autoconf' (and `autoheader', `aclocal' and `automake', where -appropriate) repeatedly to remake the Autoconf `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 predecessors. If you install a new version of -Autoconf, running `autoreconf' remakes all of the files by giving it +Run `autoconf' (and `autoheader', `aclocal', `automake' and +`gettextize', where appropriate) repeatedly to remake the GNU Build +System files in the directory tree rooted at the current directory. +By default, it only remakes those files that are older than their +predecessors. If you install a new version of GNU Build System +components, running `autoreconf' remakes all of the files by giving it the `--force' option. .SS "Operation modes:" .TP