* lib/autom4te.in (Automake-preselections): Preselect AC_SUBST_TRACE.

diff --git a/ChangeLog b/ChangeLog
index 4b3ad6ada787a7f1f7eb526bdc427d2d2589e2e6..e88a8f02316431c5bb20ada01490d9fb0cd83da9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-30  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/autom4te.in (Automake-preselections): Preselect AC_SUBST_TRACE.
+
 2005-06-29  Stepan Kasal  <kasal@ucw.cz>
 
        * doc/autoconf.texi (File Descriptors): ksh doesn't pass open file

diff --git a/lib/autom4te.in b/lib/autom4te.in
index d13a85885e6b41ced6d101f5844583516a3c362b..3b9c14274b29a891ec61fb3075e83c43ab317c47 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -1,6 +1,6 @@
 # Definition of Autom4te option sets.                     -*- Makefile -*-
 #
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GNU Autoconf.
 #
@@ -49,7 +49,9 @@ args: --preselect AC_CONFIG_LINKS
 args: --preselect AC_INIT
 args: --preselect AC_LIBSOURCE
 args: --preselect AC_REQUIRE_AUX_FILE
+# Automake < 1.10 traces AC_SUBST.  Automake >= 1.10 traces AC_SUBST_TRACE.
 args: --preselect AC_SUBST
+args: --preselect AC_SUBST_TRACE
 args: --preselect AM_AUTOMAKE_VERSION
 args: --preselect AM_CONDITIONAL
 args: --preselect AM_GNU_GETTEXT