* bin/autoreconf.in (help): Document M4 environment variable.

* bin/autoconf.as (Usage): Likewise.
* bin/autom4te.in (help): Likewise.
* doc/autoconf.texi (autom4te Invocation): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2ce8c627dbe783ac6ba67fdc8c23e25928df91b8..9d84f80320db365482cd62ebab62769ad4b728cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-04  Eric Blake  <ebb9@byu.net>
+
+       * bin/autoreconf.in (help): Document M4 environment variable.
+       * bin/autoconf.as (Usage): Likewise.
+       * bin/autom4te.in (help): Likewise.
+       * doc/autoconf.texi (autom4te Invocation): Likewise.
+
 2006-06-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: GNU make now recommended for VPATH builds.

diff --git a/bin/autoconf.as b/bin/autoconf.as
index 2d31e5beb0f9ad97c042d26c0aefafbe963432d0..c967c26c66895295fc3f837c026b9c43819fffda 100644 (file)
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -45,7 +45,7 @@ Warning categories include:
   \`none'          turn off all the warnings
   \`error'         warnings are error
 
-The environment variable \`WARNINGS' is honored.
+The environment variables \`M4' and \`WARNINGS' are honored.
 
 Library directories:
   -B, --prepend-include=DIR  prepend directory DIR to search path

diff --git a/bin/autom4te.in b/bin/autom4te.in
index c133cddc119b6b5b19f3d51a9c49e06cacb68264..95a19e77cbb6f40a565047693d3de652a27a7f9d 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -191,7 +191,7 @@ Languages include:
 
 " . Autom4te::ChannelDefs::usage . "
 
-The environment variable \`WARNINGS\' is honored.
+The environment variables \`M4\' and \`WARNINGS\' are honored.
 
 Library directories:
   -B, --prepend-include=DIR  prepend directory DIR to search path

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 9099498131408523994500730a2057fd9dc05a9b..fafb79359d5852d1d2047b7884fa00ade653e665 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -89,7 +89,7 @@ Library directories:
   -I, --include=DIR          append directory DIR to search path
 
 The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL,
-AUTOPOINT, LIBTOOLIZE are honored.
+AUTOPOINT, LIBTOOLIZE, M4 are honored.
 
 Report bugs to <bug-autoconf\@gnu.org>.
 ";

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 52501d532428021f7fb700d85e4b00176b96762c..7317d0b98e6c0d70d643ce5b249926e59e7a2486 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -9140,7 +9140,10 @@ autom4te @var{options} @var{files}
 @end example
 
 @noindent
-where the @var{files} are directly passed to @command{m4}.  In addition
+@evindex M4
+where the @var{files} are directly passed to @command{m4}.  By default,
+@acronym{GNU} m4 is found during configure, but the environment variable
+@env{M4} can be set to tell @command{autom4te} where to look.  In addition
 to the regular expansion, it handles the replacement of the quadrigraphs
 (@pxref{Quadrigraphs}), and of @samp{__oline__}, the current line in the
 output.  It supports an extended syntax for the @var{files}: