Index: configure
===================================================================
--- configure	(revision c59712ef719214c06c49604e482d89f51c7745d4)
+++ configure	(revision ff1e0f38b2bf523763024876e746508c1928685e)
@@ -665,6 +665,16 @@
 CXX
 CFA_FLAGS
+LIBCFA_TARGET_MAKEFILES
+LIBCFA_TARGET_DIRS
+TARGET_HOSTS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 BUILD_IN_TREE_FLAGS
-BUILD_IN_TREE_FLAGS_NOLIB
 CFACPP
 CFACC
@@ -678,15 +688,4 @@
 DOendif
 DOifskipcompile
-LIBCFA_TARGET_MAKEFILES
-LIBCFA_TARGET_DIRS
-TARGET_HOSTS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
 CFA_NAME
 am__untar
@@ -761,6 +760,6 @@
 enable_silent_rules
 with_cfa_name
+with_backend_compiler
 with_target_hosts
-with_backend_compiler
 enable_dependency_tracking
 '
@@ -1421,6 +1420,6 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-cfa-name=NAME     NAME too which cfa will be installed
+  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
   --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:debug|nodebug|nolib
-  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
 
 Some influential environment variables:
@@ -3086,127 +3085,4 @@
 
 
-#==============================================================================
-# handle the list of hosts to build for
-for var in $ac_configure_args
-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=*) ;;
-
-		# append all other arguments to the sub configure arguments
-		*) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
-	esac
-done
-
-echo $LIBCFA_GENERAL_ARGS
-
-#==============================================================================
-# handle the list of hosts to build for
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
-
-# Check whether --with-target-hosts was given.
-if test "${with_target_hosts+set}" = set; then :
-  withval=$with_target_hosts; target_hosts=$withval
-else
-  target_hosts=${default_target}
-fi
-
-
-TARGET_HOSTS=${target_hosts}
-
-
-for i in $(echo $target_hosts | sed "s/,/ /g")
-do
-	# call your procedure/other scripts here below
-	lib_arch=$(echo $i | sed -r "s/:(.*)//g")
-	lib_config=$(echo $i | sed -r "s/(.*)://g")
-	lib_dir="libcfa-${lib_arch}-${lib_config}"
-
-	LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
-	LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
-
-	mkdir -p libcfa-${lib_arch}-${lib_config}
-	echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
-	echo -n "--host=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
-	echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
-done
-
-
-
-
 
 #==============================================================================
@@ -3395,32 +3271,162 @@
 #==============================================================================
 # Create variables for commonly used targets
-DRIVER_DIR='$(top_builddir)/driver'
-CFACC=${DRIVER_DIR}/cfa
-CFACPP=${DRIVER_DIR}/cfa-cpp
-
-
+
+TOP_SRCDIR=$ac_pwd/$ac_confdir/
+TOP_BUILDDIR=$ac_pwd/
+PRELUDE_BUILDDIR=$ac_pwd/libcfa-x86_64-debug/prelude/
 
 
 cat >>confdefs.h <<_ACEOF
-#define TOP_SRCDIR "$ac_pwd/$ac_confdir/"
+#define TOP_SRCDIR "$TOP_SRCDIR"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define TOP_BUILDDIR "$ac_pwd/"
+#define TOP_BUILDDIR "$TOP_BUILDDIR"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define PRELUDE_BUILDDIR "$ac_pwd/libcfa/prelude/"
-_ACEOF
+#define PRELUDE_BUILDDIR "$PRELUDE_BUILDDIR"
+_ACEOF
+
+
+DRIVER_DIR=${TOP_BUILDDIR}driver/
+CFACC=${DRIVER_DIR}cfa
+CFACPP=${DRIVER_DIR}cfa-cpp
+
+
 
 
 #==============================================================================
 # Flag variables needed to build in tree
-LIBCFA_SRC='$(top_srcdir)/libcfa/src'
-LIBCFA_BUILD='$(top_builddir)/libcfa/src'
-BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
-BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
+LIBCFA_SRC='${TOP_SRCDIR}/libcfa/src'
+BUILD_IN_TREE_FLAGS="-XCFA -t -B${DRIVER_DIR}"
+
+
+#==============================================================================
+# handle the list of hosts to build for
+for var in $ac_configure_args
+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=*) ;;
+
+		# skip the target hosts
+		--with-target-hosts=*) ;;
+
+		# append all other arguments to the sub configure arguments
+		*) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
+	esac
+done
+
+#==============================================================================
+# handle the list of hosts to build for
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
+
+# Check whether --with-target-hosts was given.
+if test "${with_target_hosts+set}" = set; then :
+  withval=$with_target_hosts; target_hosts=$withval
+else
+  target_hosts=${default_target}
+fi
+
+
+TARGET_HOSTS=${target_hosts}
+
+
+LIBCFA_PATHS="DRIVER_DIR=${DRIVER_DIR}"
+
+for i in $(echo $target_hosts | sed "s/,/ /g")
+do
+	# call your procedure/other scripts here below
+	lib_arch=$(echo $i | sed -r "s/:(.*)//g")
+	lib_config=$(echo $i | sed -r "s/(.*)://g")
+	lib_dir="libcfa-${lib_arch}-${lib_config}"
+
+	LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
+	LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
+
+	mkdir -p libcfa-${lib_arch}-${lib_config}
+	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 "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
+done
+