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

AC_CANONICAL_BUILD and AC_CANONICAL_TARGET.  Automake 1.9.1 will
trace them.

diff --git a/ChangeLog b/ChangeLog
index c490b53b1cb291b263570807bbc52aaa2e317022..f043da2d01bd7f1e2097e3765befe6b235673695 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-02  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/autom4te.in (Automake-preselections): Preselect
+       AC_CANONICAL_BUILD and AC_CANONICAL_TARGET.  Automake 1.9.1 will
+       trace them.
+
 2004-07-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/m4sugar/m4sh.m4 (_AS_BOURNE_COMPATIBLE): Set BIN_SH, for
@@ -75,7 +81,7 @@
 
        * doc/autoconf.texi (testsuite Scripts): Fix typo.
        Problem reported by Stepan Kasal.
-       
+
 2004-05-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * tests/Makefile.am (autoconfdir): Fix to match comment (trivial

diff --git a/lib/autom4te.in b/lib/autom4te.in
index fad18e9e05c817be09e896f91f8a1e9d11e93188..4a918777e009419f2aba0c9b3d519901fbc41e83 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -35,8 +35,12 @@ end-language: "Autoheader-preselections"
 ## ------------------------ ##
 
 begin-language: "Automake-preselections"
+args: --preselect AC_CANONICAL_BUILD
 args: --preselect AC_CANONICAL_HOST
+# AC_CANONICAL_SYSTEM was traced from Automake 1.7 to Automake 1.9.
+# Later versions trace AC_CANONICAL_TARGET instead.
 args: --preselect AC_CANONICAL_SYSTEM
+args: --preselect AC_CANONICAL_TARGET
 args: --preselect AC_CONFIG_AUX_DIR
 args: --preselect AC_CONFIG_FILES
 args: --preselect AC_CONFIG_HEADERS