* doc/autoconf.texi (Defining Symbols): Literal parameter of

AC_DEFINE is now passed to m4_pattern_allow.
* NEWS: Mention that; likewise for AC_SUBST.
* lib/autoconf/general.m4 (AC_DEFINE_TRACE_LITERAL): Pass
the parameter to m4_pattern_allow.
* tests/tools.at: Add a check for that.

diff --git a/ChangeLog b/ChangeLog
index 0de5e4c33365f98521b7b22a1205453d1288750e..393ba1b31c194cc5c33f1909284fd6ea68d5b13e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-22  Stepan Kasal  <kasal@ucw.cz>
+
+       * doc/autoconf.texi (Defining Symbols): Literal parameter of
+       AC_DEFINE is now passed to m4_pattern_allow.
+       * NEWS: Mention that; likewise for AC_SUBST.
+       * lib/autoconf/general.m4 (AC_DEFINE_TRACE_LITERAL): Pass
+       the parameter to m4_pattern_allow.
+       * tests/tools.at: Add a check for that.
+
 2006-05-22  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/status.m4: Fix typos.

diff --git a/NEWS b/NEWS
index 98786083866ce6c3eeefa3c5bf068417f3cbde60..4a0a21dc0a02590373ea778ecfcbfa6a92e3f5a7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
   These never-documented variables have been marked with a comment
   saying that we intend to remove them in a future release.
 
+** AC_SUBST, AC_DEFINE
+  Literal arguments to these are passed to m4_pattern_allow now.
+
 ** AC_PROG_CC_STDC
   Passing 'ac_cv_prog_cc_stdc=no' to 'configure' now sets ac_cv_prog_cc_c99
   and ac_cv_prog_cc_c89 to 'no' as well, for backward compatibility with

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index c6e71102de3da09a25406fc34164c1ad561d6ed1..736a8022c03e6bd2318075ecc252a6466fa9f338 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -7948,6 +7948,9 @@ If neither @var{value} nor @var{description} are given, then
 @var{value} defaults to 1 instead of to the empty string.  This is for
 backwards compatibility with older versions of Autoconf, but this usage
 is obsolescent and may be withdrawn in future versions of Autoconf.
+
+If the @var{variable} is a literal string, it is passed to
+@code{m4_pattern_allow} (@pxref{Forbidden Patterns}).
 @end defmac
 
 @defmac AC_DEFINE_UNQUOTED (@var{variable}, @var{value}, @ovar{description})

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 93ffd5a5cf90401968b07a831502864a6a88c756..7578e9d1309d41a3e3366bdd0b9e874f0d013bc2 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1940,9 +1940,9 @@ AS_LITERAL_IF([$2],
 
 # AC_DEFINE_TRACE_LITERAL(LITERAL-CPP-SYMBOL)
 # -------------------------------------------
-# This macro is useless, it is used only with --trace to collect the
-# list of *literals* CPP values passed to AC_DEFINE/AC_DEFINE_UNQUOTED.
-m4_define([AC_DEFINE_TRACE_LITERAL])
+# Used by --trace to collect the list of AC_DEFINEd macros.
+m4_define([AC_DEFINE_TRACE_LITERAL],
+[m4_pattern_allow([^$1$])])
 
 
 # AC_DEFINE_TRACE(CPP-SYMBOL)

diff --git a/tests/tools.at b/tests/tools.at
index f1a0ed8920684df64ed700829893252f6a409149..be6f3b687975d5115b568d33794bfa75fc148d13 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -309,6 +309,23 @@ AT_CHECK_AUTOCONF([], 1, [], [experr])
 AT_CLEANUP
 
 
+# autoconf: automatically allowed tokens
+# --------------------------------------
+AT_SETUP([autoconf: automatically alowed tokens])
+
+AT_DATA_M4SH([configure.ac],
+[[AC_INIT
+m4_pattern_forbid([^FB_])
+AC_DEFINE([FB_ONE])
+AC_SUBST([FB_TWO])
+AC_OUTPUT
+]])
+
+AT_CHECK_AUTOCONF
+
+AT_CLEANUP
+
+
 # autoconf: subdirectories
 # --------------------------------------
 AT_SETUP([autoconf: subdirectories])