* bin/autoconf.in, bin/autoheader.in: --force, -f is a new option.

diff --git a/ChangeLog b/ChangeLog
index d070643cc5ca4259fa607616276f82d540b8b390..c3ef29dee50e14b830a862a8fc1c6fa0b65611c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-07  Akim Demaille  <akim@epita.fr>
+
+       * bin/autoconf.in, bin/autoheader.in: --force, -f is a new option.
+
+2001-08-07  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * bin/autom4te.in (handle_output): Typo in quadrigraph substitution.
+
 2001-08-04  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/functions.m4 (AC_FUNC_ALLOCA, AC_FUNC_ERROR_AT_LINE)

diff --git a/NEWS b/NEWS
index 78758dc430669b505b049901221362aca6634f4c..0821e5d2ec073344e6f889d803831eb51f368c70 100644 (file)
--- 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
 \f
 * Major changes in Autoconf 2.52
 ** Documentation

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 45d9bb65e6ca8a455da5d2a87053ef71881decf0..b0709cb13d903e1a2089a810413668b0e5abbee9 100644 (file)
--- 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 492ad07796ff90ff0d6fc89708b592f57448d105..33e24afa7cb0b4588a67a83e0209f2e90a5895ce 100644 (file)
--- 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 a4196343920d2d39e607823d8b6c7b9b98037454..4bd77dd29bae85bee6b94b3f5b14e7f163259132 100644 (file)
--- 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 19f3eab73ac0c6e4b5c738bc37276ccf44945489..aa691dea3adcc9450a01368d0661c7846b51b765 100644 (file)
--- 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 67e59d3cdeafd547c0b6427ec0530c6adfa5a870..5afea92952cb905e1ddc862255c35391eb428437 100644 (file)
--- 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 6679040b7ff188137a9564dd95383a1ac5bcaa7c..c2aae4c0d1fe61ea3a99a7354967f26c6b2e1628 100644 (file)
--- 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 8b22b54d7fd45bcf6a2b84812101f3b0112ff813..24bcc37977134338687e719ac5838c58a59ddd9e 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" "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 3c910e9958154f5e9decc94dc5c8bd9b118fd10f..686f8b1721becc9623787b4bc0d680da51df6215 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" "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