* lib/autom4te.in (Autoconf): Move all args except aclocal.m4? into ...

(Autoconf-without-aclocal-m4): ... this new language.
* doc/autoconf.texi (autom4te Invocation): Mention
Autoconf-without-aclocal-m4.

diff --git a/ChangeLog b/ChangeLog
index 74981545d35f4b0bb205ff0c55e0e8613b1f47b0..f5e42492e4dffb9fe80bd57c99ede96a3f03e8ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-19  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/autom4te.in (Autoconf): Move all args except aclocal.m4? into ...
+       (Autoconf-without-aclocal-m4): ... this new language.
+       * doc/autoconf.texi (autom4te Invocation): Mention
+       Autoconf-without-aclocal-m4.
+
 2003-08-18  Derek Price <derek@ximbiot.com>
 
        * doc/autoconf.texi (Writing testsuite.at): Document RUN-IF-FAIL &
@@ -59,7 +66,7 @@
        http://mail.gnu.org/archive/html/autoconf-patches/2003-07/msg00007.html
        (This really should be 'intptr_t', not 'long', but that would
        take more work.)
-       
+
 2003-06-25  Akim Demaille  <akim@epita.fr>
 
        * lib/Makefile.am (autom4te.cfg): Make it read only.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index afffdf8b568ff75673f9dd630dc100e9cb489d3e..0bbd6acff1b54b9f5cd0d8fa9843e167d2cde981 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -7914,6 +7914,10 @@ 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}.
 @end table
 
 @item --prepend-include=@var{dir}

diff --git a/lib/autom4te.in b/lib/autom4te.in
index 2e9f3631831427bb9ae0859f82a271140af9846a..82753567eceff836ff4f8b693913207d03fa34f2 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -156,22 +156,33 @@ args: --preselect AM_GNU_GETTEXT
 end-language: "Autoscan-preselections"
 
 
-## ---------- ##
-## Autoconf.  ##
-## ---------- ##
+## ----------------------------- ##
+## Autoconf without aclocal.m4.  ##
+## ----------------------------- ##
 
-begin-language: "Autoconf"
+# This intermediate language is used by aclocal to build aclocal.m4.
+
+begin-language: "Autoconf-without-aclocal-m4"
 args: --prepend-include @datadir@
 args: --cache=autom4te.cache
 args: autoconf/autoconf.m4f
 args: acsite.m4?
-args: aclocal.m4?
 args: --mode 777
 args: --language Autoheader-preselections
 args: --language Automake-preselections
 args: --language Autoreconf-preselections
 args: --language Autoscan-preselections
 args: --language M4sh
+end-language: "Autoconf-without-aclocal-m4"
+
+
+## ---------- ##
+## Autoconf.  ##
+## ---------- ##
+
+begin-language: "Autoconf"
+args: --language Autoconf-without-aclocal-m4
+args: aclocal.m4?
 end-language: "Autoconf"