From 8429b06424234851953ade44a8556158b6b83f18 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Wed, 30 Oct 2002 09:00:23 +0000
Subject: [PATCH] * bin/autom4te.in (&parse_args, $help): Support --no-cache. *
 doc/autoconf.texi (autom4te Invocation): Adjust. Suggested by Tim van Holder.

---
 ChangeLog         |  6 ++++++
 NEWS              | 12 +++++++-----
 bin/autom4te.in   |  4 +++-
 doc/autoconf.texi | 10 ++++++----
 man/autom4te.1    |  5 ++++-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae094269..d6fc35e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-30  Akim Demaille  <akim@epita.fr>
+
+	* bin/autom4te.in (&parse_args, $help): Support --no-cache.
+	* doc/autoconf.texi (autom4te Invocation): Adjust.
+	Suggested by Tim van Holder.
+
 2002-10-29  Paul Eggert  <eggert@twinsun.com>
 
 	* doc/autoconf.texi (Particular Functions): AC_FUNC_MALLOC and
diff --git a/NEWS b/NEWS
index c23e93c3..3f11f403 100644
--- a/NEWS
+++ b/NEWS
@@ -30,16 +30,18 @@ Release tips:
 
 - Supports -W/--warnings.
 
+** autom4te
+
+- Supports --cache, and --no-cache.
+
+- ~/.autom4te.cfg makes it possible to disable the caching mechanism
+  (autom4te.cache).  See `Customizing autom4te' in the documentation.
+
 ** Obsolete options
 
   Support for the obsoleted options -m, --macrodir, -l, --localdir is
   dropped in favor of the safer --include/--prepend-include scheme.
 
-** Customization
-
-- ~/.autom4te.cfg makes it possible to disable the caching mechanism
-  (autom4te.cache).  See `Customizing autom4te' in the documentation.
-
 ** Macros
 
 - New macros
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 18b2cc0c..c8639bf7 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -367,7 +367,8 @@ Operation modes:
   -f, --force              don\'t rely on cached values
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY
   -l, --language=LANG      specify the set of M4 macros to use
-  -C, --cache=[DIRECTORY]  preserve results for future runs in DIRECTORY
+  -C, --cache=DIRECTORY    preserve results for future runs in DIRECTORY
+      --no-cache           disable the cache
   -m, --mode=OCTAL         change the non trace output file mode (0666)
   -M, --melt               don\'t use M4 frozen files
 
@@ -546,6 +547,7 @@ sub parse_args ()
 
      # Caching.
      "C|cache=s" => \$cache,
+     "no-cache"  => sub { $cache = undef; },
     );
 
   error "too few arguments
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 7d5745f9..8d970dd4 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -7525,13 +7525,15 @@ be removed} at any moment (especially if for some reason
 @command{autom4te} considers it is trashed).
 
 @table @option
-@item --cache=[@var{directory}]
-@itemx -C
-@itemx -C@var{directory}
+@item --cache=@var{directory}
+@itemx -C @var{directory}
 Specify the name of the directory where the result should be cached.
 Passing an empty value disables caching.  Be sure to pass a relative
 path name, as for the time being, global caches are not supported.
 
+@item --no-cache
+Don't cache the results.
+
 @item --force
 @itemx -f
 If a cache is used, consider it obsolete (but update it anyway).
@@ -7684,7 +7686,7 @@ globally, include the following lines in @file{~/.autom4te.cfg}:
 ## ------------------ ##
 
 begin-language: "Autoconf"
-args: --cache ''
+args: --no-cache
 end-language: "Autoconf"
 @end verbatim
 
diff --git a/man/autom4te.1 b/man/autom4te.1
index 85089b89..427bd7fe 100644
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -43,9 +43,12 @@ report the warnings falling in CATEGORY
 \fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
 specify the set of M4 macros to use
 .TP
-\fB\-C\fR, \fB\-\-cache\fR=\fI[DIRECTORY]\fR
+\fB\-C\fR, \fB\-\-cache\fR=\fIDIRECTORY\fR
 preserve results for future runs in DIRECTORY
 .TP
+\fB\-\-no\-cache\fR
+disable the cache
+.TP
 \fB\-m\fR, \fB\-\-mode\fR=\fIOCTAL\fR
 change the non trace output file mode (0666)
 .TP