* lib/autoconf/general.m4 (AC_SUBST, AC_SUBST_FILES): Pass $1 to

m4_pattern_allow.
Suggested by Alexandre Duret-Lutz.
* doc/autoconf.texi (Setting Output Variables): Catch up.

diff --git a/ChangeLog b/ChangeLog
index 2fac3985fa1dba5623a03b2bbf7c0b821fc109bb..66e226d5b656fdda183ce55a9c3b48b538fe9cd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-17  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/general.m4 (AC_SUBST, AC_SUBST_FILES): Pass $1 to
+       m4_pattern_allow.
+       Suggested by Alexandre Duret-Lutz.
+       * doc/autoconf.texi (Setting Output Variables): Catch up.
+
 2004-12-17  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Fix comment.

diff --git a/NEWS b/NEWS
index 7d47002278c75316df6ca8114aa5d719b798a503..fdb43f8f935de0081c375e8794f983c93ad3acc9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* Major changes in Autoconf 2.59c
+
 * Major changes in Autoconf 2.59b
 
   Released 2004-08-20, by Paul Eggert.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 6a23a61923715a1a5bffa27022bc1ee5425325de..cfabfe2c6839c9cb9f5545e67db4e2071856a496 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -7209,6 +7209,9 @@ newlines.  (There is currently no portable way to escape literal
 newlines.)
 
 If @var{value} is given, in addition assign it to @var{variable}.
+
+The string @var{variable} is passed to @code{m4_pattern_allow}
+(@pxref{Forbidden Patterns}).
 @end defmac
 
 @defmac AC_SUBST_FILE (@var{variable})
@@ -7228,7 +7231,7 @@ or target types into @file{Makefile}s.  For example, @file{configure.ac}
 could contain:
 
 @example
-AC_SUBST_FILE(host_frag)
+AC_SUBST_FILE([host_frag])
 host_frag=$srcdir/conf/sun4.mh
 @end example
 
@@ -7238,6 +7241,9 @@ and then a @file{Makefile.in} could contain:
 @example
 @@host_frag@@
 @end example
+
+The string @var{variable} is passed to @code{m4_pattern_allow}
+(@pxref{Forbidden Patterns}).
 @end defmac
 
 @cindex Previous Variable

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 786c825ff0dc7d8427217d2bac2dc62b3940e637..3b29da06b604ff8f6852b51ce66b7163b8e3d17e 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1890,7 +1890,8 @@ _ACEOF
 # Beware that if you change this macro, you also have to change the
 # sed script at the top of _AC_OUTPUT_FILES.
 m4_define([AC_SUBST],
-[m4_ifvaln([$2], [$1=$2])[]dnl
+[m4_pattern_allow([^$1$])dnl
+m4_ifvaln([$2], [$1=$2])[]dnl
 m4_append_uniq([_AC_SUBST_VARS], [$1], [ ])dnl
 ])# AC_SUBST
 
@@ -1899,7 +1900,8 @@ m4_append_uniq([_AC_SUBST_VARS], [$1], [ ])dnl
 # -----------------------
 # Read the comments of the preceding macro.
 m4_define([AC_SUBST_FILE],
-[m4_append_uniq([_AC_SUBST_FILES], [$1], [ ])])
+[m4_pattern_allow([^$1$])dnl
+m4_append_uniq([_AC_SUBST_FILES], [$1], [ ])])