Index: configure
===================================================================
--- configure	(revision 4dcaed2c212a42d633824e9b88053258a2d0f969)
+++ configure	(revision 37fe3525f53534b29c07f4f1204c5f779836d193)
@@ -2523,4 +2523,8 @@
 
 
+
+
+
+
 am__api_version='1.15'
 
@@ -3070,10 +3074,11 @@
 #==============================================================================
 #Trasforming cc1 will break compilation
-if test "${program_transform_name}" = ""; then
-    as_fn_error $? "Program transform not supported.
-		Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
-fi
-
-#Define the new name of the installed command
+
+	if test "${program_transform_name}" = ""; then
+	as_fn_error $? "Program transform not supported.
+			Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+	fi
+
+	#Define the new name of the installed command
 
 # Check whether --with-cfa-name was given.
@@ -3085,5 +3090,5 @@
 
 
-CFA_NAME=${cfa_name}
+	CFA_NAME=${cfa_name}
 
 
@@ -3261,7 +3266,7 @@
 
 	if test "$libdir" = '${exec_prefix}/lib'; then
-		cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+		cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
 	else
-		cfa_libdir=${libdir}
+		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
 
@@ -3415,21 +3420,34 @@
 	arch_name=$(echo $i | sed -r "s/:(.*)//g")
 	lib_config=$(echo $i | sed -r "s/(.*)://g")
-	if test $lib_config != "nodebug";
-	then
-		if test $lib_config != "debug";
-		then
-			if test $lib_config != "nolib";
-			then
-				>&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
-				exit 1
-			fi
-		fi
-	fi
-
-	lib_arch=$($ac_aux_dir/config.sub $arch_name)
-	if test "$?" != "0"; then
+
+	case $lib_config in
+		"nodebug") ;;
+		"debug") ;;
+		"nolib") ;;
+		*)
+			>&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+			exit 1
+		;;
+	esac
+
+
+	case $arch_name in
+		"x64"        ) cannon_arch_name="x64";;
+		"x86-64"     ) cannon_arch_name="x64";;
+		"x86_64"     ) cannon_arch_name="x64";;
+		"x86"        ) cannon_arch_name="x86";;
+		"i386"       ) cannon_arch_name="x86";;
+		"i486"       ) cannon_arch_name="x86";;
+		"i686"       ) cannon_arch_name="x86";;
+		"Intel 80386") cannon_arch_name="x86";;
+		"arm"        ) cannon_arch_name="arm";;
+		"ARM"        ) cannon_arch_name="arm";;
+		*)
 		>&2 echo "Unkown architecture " $arch_name;
-		exit 1;
-	fi
+		exit 1
+		;;
+	esac
+
+	lib_arch=${cannon_arch_name}
 	lib_dir="libcfa-${lib_arch}-${lib_config}"
 
@@ -3440,9 +3458,43 @@
 	echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
 	echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data
-	echo -n "--host=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
+	echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
 	echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
 done
 
 
+
+
+
+	case $arch_name in
+		"x64"        ) cannon_arch_name="x64";;
+		"x86-64"     ) cannon_arch_name="x64";;
+		"x86_64"     ) cannon_arch_name="x64";;
+		"x86"        ) cannon_arch_name="x86";;
+		"i386"       ) cannon_arch_name="x86";;
+		"i486"       ) cannon_arch_name="x86";;
+		"i686"       ) cannon_arch_name="x86";;
+		"Intel 80386") cannon_arch_name="x86";;
+		"arm"        ) cannon_arch_name="arm";;
+		"ARM"        ) cannon_arch_name="arm";;
+		*)
+		>&2 echo "Unkown architecture " $arch_name;
+		exit 1
+		;;
+	esac
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_DEFAULT_CPU "$cannon_arch_name"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_64_CPU "x64"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_32_CPU "x86"
+_ACEOF