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

	* lib/autoconf/general.m4 (AC_CANONICAL_BUILD): Rename
	  ac_cv_build_alias to ac_build_alias.
	(AC_CANONICAL_HOST, AC_CANONICAL_TARGET): Simplify.

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:38 -0000
@@ -1663,7 +1663,6 @@
 # Generate the variables THING, THING_{alias cpu vendor os}.
 m4_define([_AC_CANONICAL_SPLIT],
 [AC_SUBST([$1],       [$ac_cv_$1])dnl
-dnl FIXME: AC_SUBST([$1_alias],  [$ac_cv_$1_alias])dnl
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_$1
 shift
@@ -1698,13 +1697,13 @@
   AC_MSG_ERROR([cannot run $ac_config_sub])
 
 AC_CACHE_CHECK([build system type], [ac_cv_build],
-[ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+[ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$ac_config_guess`
+test "x$ac_build_alias" = x &&
   AC_MSG_ERROR([cannot guess build type; you must specify one])
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  AC_MSG_ERROR([$ac_config_sub $ac_cv_build_alias failed])
+ac_cv_build=`$ac_config_sub $ac_build_alias` ||
+  AC_MSG_ERROR([$ac_config_sub $ac_build_alias failed])
 ])
 _AC_CANONICAL_SPLIT(build)
 ])# AC_CANONICAL_BUILD
@@ -1717,11 +1716,12 @@
 m4_divert_text([HELP_CANON],
 [[  --host=HOST       cross-compile to build programs to run on HOST [BUILD]]])dnl
 AC_CACHE_CHECK([host system type], [ac_cv_host],
-[ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  AC_MSG_ERROR([$ac_config_sub $ac_cv_host_alias failed])
+[if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$ac_config_sub $host_alias` ||
+    AC_MSG_ERROR([$ac_config_sub $host_alias failed])
+fi
 ])
 _AC_CANONICAL_SPLIT([host])
 ])# AC_CANONICAL_HOST
@@ -1735,12 +1735,12 @@
 m4_divert_text([HELP_CANON],
 [[  --target=TARGET   configure for building compilers for TARGET [HOST]]])dnl
 AC_CACHE_CHECK([target system type], [ac_cv_target],
-[dnl Set target_alias.
-ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  AC_MSG_ERROR([$ac_config_sub $ac_cv_target_alias failed])
+[if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$ac_config_sub $target_alias` ||
+    AC_MSG_ERROR([$ac_config_sub $target_alias failed])
+fi
 ])
 _AC_CANONICAL_SPLIT([target])