* doc/autoconf.texi (autom4te Invocation): Language Autoconf

inherits from language Autoconf-without-aclocal-m4.
(Customizing autom4te): Adjust example; the cache must now be
disabled for language Autoconf-without-aclocal-m4.

diff --git a/ChangeLog b/ChangeLog
index 7b11fc4fab7c78be61cb091f4dc0e1fc500693f0..002fe13ecaf514875a216e811c9b6a6a00180d5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-19  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * doc/autoconf.texi (autom4te Invocation): Language Autoconf
+       inherits from language Autoconf-without-aclocal-m4.
+       (Customizing autom4te): Adjust example; the cache must now be
+       disabled for language Autoconf-without-aclocal-m4.
+
 2004-03-16  Paolo Bonzini  <bonzini@gnu.org>
 
        * lib/autoconf/programs.m4 (AC_PATH_TOOL, AC_CHECK_TOOL,

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 79f6cc911416cafcbbb6abffb5ecea05f02ceecd..cae17d105a9b1ec9cc431c55a015fbeb6360dbb6 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -8331,7 +8331,7 @@ sets of combined command line arguments:
 
 @table @option
 @item --language=@var{language}
-@itemx -l =@var{language}
+@itemx -l @var{language}
 Use the @var{language} Autom4te library.  Current languages include:
 
 @table @code
@@ -8344,12 +8344,14 @@ create M4sh executable shell scripts.
 @item Autotest
 create Autotest executable test suites.
 
-@item Autoconf
-create Autoconf executable configure scripts.
-
 @item Autoconf-without-aclocal-m4
 create Autoconf executable configure scripts without
 reading @file{aclocal.m4}.
+
+@item Autoconf
+create Autoconf executable configure scripts.  This language inherits
+all the characteristics of @code{Autoconf-without-aclocal-m4} and will
+additionally read @file{aclocal.m4}.
 @end table
 
 @item --prepend-include=@var{dir}
@@ -8398,9 +8400,9 @@ globally, include the following lines in @file{~/.autom4te.cfg}:
 ## User Preferences.  ##
 ## ------------------ ##
 
-begin-language: "Autoconf"
+begin-language: "Autoconf-without-aclocal-m4"
 args: --no-cache
-end-language: "Autoconf"
+end-language: "Autoconf-without-aclocal-m4"
 @end verbatim