Move the AC_SUBST call from _AC_ARG_VAR_PRECIOUS to AC_ARG_VAR.

diff --git a/ChangeLog b/ChangeLog
index 7721a602e247f7978c9a53ae0b10293bdef4e87d..eba2aaf7455a197b46b819f1e476ba03df9bf47c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,13 @@
          ac_cv_build_alias to ac_build_alias.
        (AC_CANONICAL_HOST, AC_CANONICAL_TARGET): Simplify.
 
+       On 2005-02-24, an unintentional AC_SUBST([CC]) was introduced; this
+       change eliminates it.  Problem reported by Alexandre Duret-Lutz.
+       * lib/autoconf/general.m4 (_AC_ARG_VAR_PRECIOUS): Move the AC_SUBST ...
+       (AC_ARG_VAR): ... here.
+       (_AC_INIT_PREPARE): Call AC_SUBST for build_alias, host_alias and
+         target_alias.
+
 2005-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: New macro AC_C_TYPEOF.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 32ed0d681c5bf99f09d81d58f28e9959961bddd8..8724823c95225b8cf8b5bcce1b7d6030eea07b33 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1258,9 +1258,9 @@ AC_DEFINE_UNQUOTED([PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
 AC_SITE_LOAD
 AC_CACHE_LOAD
 _AC_ARG_VAR_VALIDATE
-_AC_ARG_VAR_PRECIOUS([build_alias])dnl
-_AC_ARG_VAR_PRECIOUS([host_alias])dnl
-_AC_ARG_VAR_PRECIOUS([target_alias])dnl
+_AC_ARG_VAR_PRECIOUS([build_alias])AC_SUBST([build_alias])dnl
+_AC_ARG_VAR_PRECIOUS([host_alias])AC_SUBST([host_alias])dnl
+_AC_ARG_VAR_PRECIOUS([target_alias])AC_SUBST([target_alias])dnl
 AC_LANG_PUSH(C)
 
 dnl Substitute for predefined variables.
@@ -1390,6 +1390,7 @@ it to find libraries and programs with nonstandard names/locations.]])dnl
 m4_expand_once([m4_divert_once([HELP_VAR],
                               [AS_HELP_STRING([$1], [$2], [              ])])],
               [$0($1)])dnl
+AC_SUBST([$1])dnl
 _AC_ARG_VAR_PRECIOUS([$1])dnl
 ])# AC_ARG_VAR
 
@@ -1409,8 +1410,7 @@ _AC_ARG_VAR_PRECIOUS([$1])dnl
 # In subsequent runs, after having loaded the cache, compare
 # ac_cv_env_foo against ac_env_foo.  See _AC_ARG_VAR_VALIDATE.
 m4_define([_AC_ARG_VAR_PRECIOUS],
-[AC_SUBST([$1])dnl
-m4_divert_once([PARSE_ARGS],
+[m4_divert_once([PARSE_ARGS],
 [ac_env_$1_set=${$1+set}
 ac_env_$1_value=$$1
 ac_cv_env_$1_set=${$1+set}