Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision 2a6292d096f75213cc1215a8e87df6c11a6e15a7)
+++ automake/cfa.m4	(revision 305581dbced29c2fe6bb06909e03de5f7b8a6b9f)
@@ -57,7 +57,7 @@
 
 AC_DEFUN([M4CFA_CANNON_CPU], [
-	case $arch_name in
+	case $1 in
 		"host") arch_name=${host_cpu};;
-		*) ;;
+		*) arch_name=$1;;
 	esac
 
Index: configure
===================================================================
--- configure	(revision 2a6292d096f75213cc1215a8e87df6c11a6e15a7)
+++ configure	(revision 305581dbced29c2fe6bb06909e03de5f7b8a6b9f)
@@ -2528,4 +2528,5 @@
 
 
+
 # don't use the default CFLAGS as they unconditonnaly add -O2
 : ${CFLAGS=""}
@@ -3459,7 +3460,7 @@
 
 
-	case $arch_name in
+	case ${arch_name} in
 		"host") arch_name=${host_cpu};;
-		*) ;;
+		*) arch_name=${arch_name};;
 	esac
 
@@ -3498,7 +3499,7 @@
 
 
-	case $arch_name in
+	case ${host_cpu} in
 		"host") arch_name=${host_cpu};;
-		*) ;;
+		*) arch_name=${host_cpu};;
 	esac
 
