2005-08-16  Stepan Kasal  <address@hidden>

	* lib/autoconf/general.m4 (_AC_CANONICAL_SPLIT): Simplify, relying
	on the fact that $* concatenates the parameters by the first
	character from IFS.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.880
diff -u -r1.880 general.m4
--- lib/autoconf/general.m4	16 Aug 2005 09:11:06 -0000	1.880
+++ lib/autoconf/general.m4	16 Aug 2005 16:49:15 -0000
@@ -1659,19 +1659,14 @@
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_$1
 shift
-IFS=$ac_save_IFS
-
 AC_SUBST([$1_cpu], [$[1]])dnl
 AC_SUBST([$1_vendor], [$[2]])dnl
-AC_SUBST([$1_os], [$[3]])dnl
 case $[#] in
-0|1|2) ;;
-*)
-  shift; shift; shift
-  for ac_arg
-  do $1_os=[$]$1_os-$ac_arg
-  done;;
+  0|1) set "";;
+  *)   shift; shift;;
 esac
+AC_SUBST([$1_os], [$[*]])dnl
+IFS=$ac_save_IFS
 ])# _AC_CANONICAL_SPLIT