Index: Makefile.in
===================================================================
--- Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -94,5 +94,6 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ automake/cfa.m4	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -0,0 +1,34 @@
+
+m4_define([M4CFA_PARSE_PREFIX], [
+	if test "x$prefix" = "xNONE"; then
+		cfa_prefix=${ac_default_prefix}
+	else
+		cfa_prefix=${prefix}
+	fi
+	AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
+	AC_SUBST(CFA_PREFIX, ${cfa_prefix})
+
+	if test "$includedir" = '${prefix}/include'; then
+		cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+	else
+		cfa_incdir=${includedir}
+	fi
+	AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
+	AC_SUBST(CFA_INCDIR, ${cfa_incdir})
+
+	if test "$bindir" = '${exec_prefix}/bin'; then
+		cfa_bindir="${cfa_prefix}/bin"
+	else
+		cfa_bindir=${bindir}
+	fi
+	AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
+	AC_SUBST(CFA_BINDIR, ${cfa_bindir})
+
+	if test "$libdir" = '${exec_prefix}/lib'; then
+		cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+	else
+		cfa_libdir=${libdir}
+	fi
+	AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
+	AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
+])
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ benchmark/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -95,5 +95,6 @@
 subdir = benchmark
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: configure
===================================================================
--- configure	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ configure	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -2520,4 +2520,7 @@
 
 
+
+
+
 am__api_version='1.15'
 
@@ -3217,9 +3220,10 @@
 #==============================================================================
 # Installation paths
-if test "x$prefix" = "xNONE"; then
-	cfa_prefix=${ac_default_prefix}
-else
-	cfa_prefix=${prefix}
-fi
+
+	if test "x$prefix" = "xNONE"; then
+		cfa_prefix=${ac_default_prefix}
+	else
+		cfa_prefix=${prefix}
+	fi
 
 cat >>confdefs.h <<_ACEOF
@@ -3227,12 +3231,12 @@
 _ACEOF
 
-CFA_PREFIX=${cfa_prefix}
-
-
-if test "$includedir" = '${prefix}/include'; then
- 	cfa_incdir="${cfa_prefix}/include/${cfa_name}"
-else
- 	cfa_incdir=${includedir}
-fi
+	CFA_PREFIX=${cfa_prefix}
+
+
+	if test "$includedir" = '${prefix}/include'; then
+		cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+	else
+		cfa_incdir=${includedir}
+	fi
 
 cat >>confdefs.h <<_ACEOF
@@ -3240,12 +3244,12 @@
 _ACEOF
 
-CFA_INCDIR=${cfa_incdir}
-
-
-if test "$bindir" = '${exec_prefix}/bin'; then
- 	cfa_bindir="${cfa_prefix}/bin"
-else
- 	cfa_bindir=${bindir}
-fi
+	CFA_INCDIR=${cfa_incdir}
+
+
+	if test "$bindir" = '${exec_prefix}/bin'; then
+		cfa_bindir="${cfa_prefix}/bin"
+	else
+		cfa_bindir=${bindir}
+	fi
 
 cat >>confdefs.h <<_ACEOF
@@ -3253,12 +3257,12 @@
 _ACEOF
 
-CFA_BINDIR=${cfa_bindir}
-
-
-if test "$libdir" = '${exec_prefix}/lib'; then
- 	cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
-else
- 	cfa_libdir=${libdir}
-fi
+	CFA_BINDIR=${cfa_bindir}
+
+
+	if test "$libdir" = '${exec_prefix}/lib'; then
+		cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+	else
+		cfa_libdir=${libdir}
+	fi
 
 cat >>confdefs.h <<_ACEOF
@@ -3266,5 +3270,6 @@
 _ACEOF
 
-CFA_LIBDIR=${cfa_libdir}
+	CFA_LIBDIR=${cfa_libdir}
+
 
 
@@ -3310,11 +3315,10 @@
 do
 	#strip quotes surrouding values
-	var=$(echo $var | sed s/\'//g)
 	case $var in
 		# skip cross compilation related arguments
-		--host=*) ;; host_alias=*) ;; --build=*) ;; build_alias=*) ;; --target=*) ;; target_alias=*) ;;
+		\'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
 
 		# skip the target hosts
-		--with-target-hosts=*) ;;
+		\'--with-target-hosts=*) ;;
 
 		# append all other arguments to the sub configure arguments
@@ -3415,6 +3419,23 @@
 do
 	# call your procedure/other scripts here below
-	lib_arch=$(echo $i | sed -r "s/:(.*)//g")
+	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
+		>&2 echo "Unkown architecture " $arch_name;
+		exit 1;
+	fi
 	lib_dir="libcfa-${lib_arch}-${lib_config}"
 
Index: configure.ac
===================================================================
--- configure.ac	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ configure.ac	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -8,4 +8,6 @@
 AC_CONFIG_HEADERS([config.h:src/config.h.in])
 AM_SILENT_RULES([no])
+
+m4_include([automake/cfa.m4])
 
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -81,35 +83,5 @@
 #==============================================================================
 # Installation paths
-if test "x$prefix" = "xNONE"; then
-	cfa_prefix=${ac_default_prefix}
-else
-	cfa_prefix=${prefix}
-fi
-AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
-AC_SUBST(CFA_PREFIX, ${cfa_prefix})
-
-if test "$includedir" = '${prefix}/include'; then
- 	cfa_incdir="${cfa_prefix}/include/${cfa_name}"
-else
- 	cfa_incdir=${includedir}
-fi
-AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
-AC_SUBST(CFA_INCDIR, ${cfa_incdir})
-
-if test "$bindir" = '${exec_prefix}/bin'; then
- 	cfa_bindir="${cfa_prefix}/bin"
-else
- 	cfa_bindir=${bindir}
-fi
-AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
-AC_SUBST(CFA_BINDIR, ${cfa_bindir})
-
-if test "$libdir" = '${exec_prefix}/lib'; then
- 	cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
-else
- 	cfa_libdir=${libdir}
-fi
-AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
-AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
+M4CFA_PARSE_PREFIX
 
 #==============================================================================
@@ -142,11 +114,10 @@
 do
 	#strip quotes surrouding values
-	var=$(echo $var | sed s/\'//g)
 	case $var in
 		# skip cross compilation related arguments
-		--host=*) ;; host_alias=*) ;; --build=*) ;; build_alias=*) ;; --target=*) ;; target_alias=*) ;;
+		\'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
 
 		# skip the target hosts
-		--with-target-hosts=*) ;;
+		\'--with-target-hosts=*) ;;
 
 		# append all other arguments to the sub configure arguments
@@ -172,6 +143,23 @@
 do
 	# call your procedure/other scripts here below
-	lib_arch=$(echo $i | sed -r "s/:(.*)//g")
+	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
+		>&2 echo "Unkown architecture " $arch_name;
+		exit 1;
+	fi
 	lib_dir="libcfa-${lib_arch}-${lib_config}"
 
Index: driver/Makefile.in
===================================================================
--- driver/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ driver/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -96,5 +96,6 @@
 subdir = driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ src/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -137,5 +137,6 @@
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ tests/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -94,5 +94,6 @@
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: tests/preempt_longrun/Makefile.in
===================================================================
--- tests/preempt_longrun/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ tests/preempt_longrun/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -93,5 +93,6 @@
 subdir = tests/preempt_longrun
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ tools/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -96,5 +96,6 @@
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
Index: tools/prettyprinter/Makefile.in
===================================================================
--- tools/prettyprinter/Makefile.in	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ tools/prettyprinter/Makefile.in	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
@@ -95,5 +95,6 @@
 subdir = tools/prettyprinter
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)