* bin/autom4te.in (warn_forbidden): When rejecting a token,

suggest m4_pattern_allow.
Suggested by Adam J. Richter.

diff --git a/ChangeLog b/ChangeLog
index 94530f516d40c584c4c61e19d2040733219704aa..cba06b75d95350591862aec35ed763f6d0be50c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-07  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in (warn_forbidden): When rejecting a token,
+       suggest m4_pattern_allow.
+       Suggested by Adam J. Richter.
+
 2002-06-07  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/general.m4 (_AC_INIT_DEFAULTS): Initialize

diff --git a/THANKS b/THANKS
index 167df0f13a918561423264145dd0bbc60af73cfb..8ba8fb9053ee6d6a2ee08cee39ba87dde12f6792 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ Aharon Robbins              arnold@gnu.org
 Akim Demaille               akim@freefriends.org
 Akinori Musha               knu@iDaemons.org
 Alain Knaff                 Alain.Knaff@imag.fr
+Adam J. Richter             adam@yggdrasil.com
 Alec Wolman                 wolman@cs.washington.edu
 Alexandre Duret-Lutz        duret_g@epita.fr
 Alexandre Oliva             oliva@lsd.ic.unicamp.br

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 3d6eec6c2d6f012922376ddb7b5459b7414fe10a..47e4fe3b7c64112af28e9c361feeb560c0f5c4e9 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -636,6 +636,7 @@ sub handle_m4 ($@)
 # $WORD is forbidden.  Warn with a dedicated error message if in
 # %FORBIDDEN, otherwise, a simple `error: possibly undefined macro'
 # will do.
+my $first_warn_forbidden = 1;
 sub warn_forbidden ($$%)
 {
   my ($where, $word, %forbidden) = @_;
@@ -651,6 +652,14 @@ sub warn_forbidden ($$%)
     }
   $message ||= "possibly undefined macro: $word";
   warn "$where: error: $message\n";
+  if ($first_warn_forbidden)
+    {
+      warn <<EOF;
+      If this token and others are legitimate, please use m4_pattern_allow.
+      See the Autoconf documentation.
+EOF
+      $first_warn_forbidden = 0;
+    }
 }