From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 19 Aug 2003 07:56:56 +0000 (+0000)
Subject: * lib/autom4te.in (Autoconf): Move all args except aclocal.m4? into ...
X-Git-Tag: AUTOCONF-2.57b~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e84cdd91bf734228bb0dcf4218afe49cbfcb89;p=thirdparty%2Fautoconf.git

* 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 74981545..f5e42492 100644
--- 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 afffdf8b..0bbd6acf 100644
--- 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 2e9f3631..82753567 100644
--- 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"