Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.886
diff -u -r1.886 general.m4
--- lib/autoconf/general.m4	19 Oct 2005 05:21:23 -0000	1.886
+++ lib/autoconf/general.m4	19 Oct 2005 05:27:20 -0000
@@ -1962,7 +1962,17 @@
 #
 m4_define([AC_SUBST],
 [AC_SUBST_TRACE([$1])dnl
-m4_pattern_allow([^$1$])dnl
+AC_SUBST_NOTRACE($@)dnl
+])
+
+
+# AC_SUBST_NOTRACE(VARIABLE, [VALUE])
+# -----------------------------------
+# Like AC_SUBST, but without the call to AC_SUBST_TRACE.  This implies
+# that this variable is not propagated to Automake-generated makefiles.
+#
+m4_define([AC_SUBST_NOTRACE],
+[m4_pattern_allow([^$1$])dnl
 m4_ifvaln([$2], [$1=$2])[]dnl
 m4_append_uniq([_AC_SUBST_VARS], [$1], [
 ])dnl
@@ -1971,7 +1981,7 @@
 
 # AC_SUBST_FILE(VARIABLE)
 # -----------------------
-# Read the comments of the preceding macro.
+# Read the comments of AC_SUBST.
 m4_define([AC_SUBST_FILE],
 [m4_pattern_allow([^$1$])dnl
 m4_append_uniq([_AC_SUBST_FILES], [$1], [