From: Alexandre Duret-Lutz Date: Thu, 30 Jun 2005 11:09:37 +0000 (+0000) Subject: * lib/autom4te.in (Automake-preselections): Preselect AC_SUBST_TRACE. X-Git-Tag: AUTOCONF-2.59c~312 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc3dab4f892f9bb201ef72f5b43f3fa892e170e;p=thirdparty%2Fautoconf.git * lib/autom4te.in (Automake-preselections): Preselect AC_SUBST_TRACE. --- diff --git a/ChangeLog b/ChangeLog index 4b3ad6ada..e88a8f023 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-30 Alexandre Duret-Lutz + + * lib/autom4te.in (Automake-preselections): Preselect AC_SUBST_TRACE. + 2005-06-29 Stepan Kasal * doc/autoconf.texi (File Descriptors): ksh doesn't pass open file diff --git a/lib/autom4te.in b/lib/autom4te.in index d13a85885..3b9c14274 100644 --- 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