2005-06-29  Stepan Kasal  <address@hidden>

	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.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.869
diff -u -r1.869 general.m4
--- lib/autoconf/general.m4	29 Jun 2005 06:37:48 -0000	1.869
+++ lib/autoconf/general.m4	29 Jun 2005 06:39:05 -0000
@@ -1294,9 +1294,9 @@
 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.
@@ -1426,6 +1426,7 @@
 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
 
@@ -1445,8 +1446,7 @@
 # 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}