From: Akim Demaille Date: Tue, 7 Aug 2001 07:55:07 +0000 (+0000) Subject: * bin/autoconf.in, bin/autoheader.in: --force, -f is a new option. X-Git-Tag: AUTOCONF-2.52d~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf7fc61b53c0e1c9546cb29dfbd0dd206202a93;p=thirdparty%2Fautoconf.git * bin/autoconf.in, bin/autoheader.in: --force, -f is a new option. --- diff --git a/ChangeLog b/ChangeLog index d070643cc..c3ef29dee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-08-07 Akim Demaille + + * bin/autoconf.in, bin/autoheader.in: --force, -f is a new option. + +2001-08-07 Alexandre Duret-Lutz + + * bin/autom4te.in (handle_output): Typo in quadrigraph substitution. + 2001-08-04 Akim Demaille * lib/autoconf/functions.m4 (AC_FUNC_ALLOCA, AC_FUNC_ERROR_AT_LINE) diff --git a/NEWS b/NEWS index 78758dc43..0821e5d2e 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,10 @@ ** autom4te New executable, used by the Autoconf suite to cache and speed up some processing. +** autoconf +- --force, -f +** autoheader +- --force, -f * Major changes in Autoconf 2.52 ** Documentation diff --git a/bin/autoconf.in b/bin/autoconf.in index 45d9bb65e..b0709cb13 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -34,6 +34,7 @@ Operation modes: -V, --version print version number, then exit -v, --verbose verbosely report processing -d, --debug don't remove temporary files + -f, --force consider all the files are obsolete -o, --output=FILE save output in FILE (stdout is the default) -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] @@ -86,6 +87,7 @@ if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi # Variables. : ${autoconf_dir=${AC_MACRODIR=@datadir@}} debug=false +force=false dir=`echo "$0" | sed -e 's,[^\\/]*$,,'` # Trace Autoconf's initialization? initialization=false @@ -117,6 +119,8 @@ while test $# -gt 0 ; do --debug | -d ) debug=:; shift ;; + --force | -f ) + force=:; shift ;; --verbose | -v ) verbose=echo shift;; @@ -231,6 +235,7 @@ done run_autom4te="$autom4te "\ `$verbose "--verbose "`\ `$debug && echo "--debug "`\ +`$force && echo "--force "`\ "--include $autoconf_dir --include $localdir "\ "--warning syntax,$warnings "\ "$preselect"\ diff --git a/bin/autoheader.in b/bin/autoheader.in index 492ad0779..33e24afa7 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -34,6 +34,7 @@ or else \`configure.in'. -V, --version print version number, then exit -v, --verbose verbosely report processing -d, --debug don't remove temporary files + -f, --force consider all the files are obsolete -W, --warnings=CATEGORY report the warnings falling in CATEGORY Warning categories include: @@ -89,6 +90,7 @@ for autoconf in "$AUTOCONF" \ done debug=false localdir=. +force=false status=0 tmp= verbose=: @@ -108,6 +110,8 @@ while test $# -gt 0 ; do --debug | -d ) debug=:; shift ;; + --force | -f ) + force=:; shift ;; --verbose | -v ) verbose=echo shift;; @@ -356,7 +360,9 @@ fi if test $status = 0; then if test $# = 0; then # Output is a file - if test -f $config_h_in && cmp -s $tmp/config.hin $config_h_in; then + if test -f $config_h_in && + cmp -s $tmp/config.hin $config_h_in && + test "$force" != :; then # File didn't change, so don't update its mod time. echo "$me: $config_h_in is unchanged" >&2 else diff --git a/bin/autom4te.in b/bin/autom4te.in index a41963439..4bd77dd29 100644 --- a/bin/autom4te.in +++ b/bin/autom4te.in @@ -604,7 +604,7 @@ sub handle_output ($$) s/__oline__/$oline/g; s/\@<:\@/[/g; s/\@:>\@/]/g; - s/\@\$\|\@/\$/g; + s/\@S\|\@/\$/g; s/\@%:\@/#/g; print $out "$_\n"; diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 19f3eab73..aa691dea3 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -36,7 +36,7 @@ Operation modes: -V, --version print version number, then exit -v, --verbose verbosely report processing -d, --debug don't remove temporary files - -f, --force consider every files are obsolete + -f, --force consider all the files are obsolete -i, --install copy missing auxiliary files -s, --symlink instead of copying, install symbolic links @@ -229,6 +229,11 @@ autoconf="$autoconf -l $localdir" autoheader="$autoheader -l $localdir" # --force $force || automake="$automake --no-force" +$force && +{ + autoconf="$autoconf --force" + autoheader="$autoheader --force" +} # --verbose autoconf="$autoconf `$verbose --verbose`" autoheader="$autoheader `$verbose --verbose`" diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 67e59d3cd..5afea9295 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -1126,6 +1126,10 @@ Report processing steps. @itemx -d Don't remove the temporary files. +@item --force +@itemx -f +Remake @file{configure} even if newer than its input files. + @item --autoconf-dir=@var{dir} @itemx -A @var{dir} @evindex AC_MACRODIR @@ -2392,13 +2396,17 @@ Print a summary of the command line options and exit. @itemx -V Print the version number of Autoconf and exit. +@item --verbose +@itemx -v +Report processing steps. + @item --debug @itemx -d Don't remove the temporary files. -@item --verbose -@itemx -v -Report processing steps. +@item --force +@itemx -f +Remake the template file even if newer than its input files. @item --autoconf-dir=@var{dir} @itemx -A @var{dir} diff --git a/man/autoconf.1 b/man/autoconf.1 index 6679040b7..c2aae4c0d 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -24,6 +24,9 @@ verbosely report processing \fB\-d\fR, \fB\-\-debug\fR don't remove temporary files .TP +\fB\-f\fR, \fB\-\-force\fR +consider all the files are obsolete +.TP \fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR save output in FILE (stdout is the default) .TP diff --git a/man/autoheader.1 b/man/autoheader.1 index 8b22b54d7..24bcc3797 100644 --- 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" "August 2001" "GNU Autoconf 2.52b" FSF +.TH AUTOHEADER "1" "August 2001" "GNU Autoconf 2.52c" FSF .SH NAME autoheader \- Create a template header for configure .SH SYNOPSIS @@ -22,6 +22,9 @@ verbosely report processing \fB\-d\fR, \fB\-\-debug\fR don't remove temporary files .TP +\fB\-f\fR, \fB\-\-force\fR +consider all the files are obsolete +.TP \fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR report the warnings falling in CATEGORY .SS "Warning categories include:" diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 3c910e995..686f8b172 100644 --- 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" "August 2001" "GNU Autoconf 2.52b" FSF +.TH AUTORECONF "1" "August 2001" "GNU Autoconf 2.52c" FSF .SH NAME autoreconf \- Update generated configuration files .SH SYNOPSIS @@ -28,7 +28,7 @@ verbosely report processing don't remove temporary files .TP \fB\-f\fR, \fB\-\-force\fR -consider every files are obsolete +consider all the files are obsolete .TP \fB\-i\fR, \fB\-\-install\fR copy missing auxiliary files