Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision c59712ef719214c06c49604e482d89f51c7745d4)
+++ libcfa/configure	(revision ff1e0f38b2bf523763024876e746508c1928685e)
@@ -618,4 +618,20 @@
 CXXFLAGS
 CXX
+CFA_LIBDIR
+CFA_BINDIR
+CFA_INCDIR
+CFA_PREFIX
+CFACPP
+CFACC
+DRIVER_DIR
+CONFIGURATION
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
@@ -693,4 +709,6 @@
 host_alias
 target_alias
+CONFIGURATION
+DRIVER_DIR
 CXX
 CXXFLAGS
@@ -1315,4 +1333,8 @@
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
@@ -1336,4 +1358,8 @@
 
 Some influential environment variables:
+  CONFIGURATION
+              The configuration to use when building libcfa, options are:
+              deubg, nodebug, nolib (prelude-only)
+  DRIVER_DIR  The path to the cforall driver directory
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -2467,4 +2493,138 @@
 # Allow program name tansformation
 # will fill program_transform_name with appropriate sed regex
+
+
+# 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
+
+
+
+
+
+
+CFACC=${DRIVER_DIR}cfa
+CFACPP=${DRIVER_DIR}cfa-cpp
+
+
+
+#==============================================================================
+# Installation paths
+if test "x$prefix" = "xNONE"; then
+	cfa_prefix=${ac_default_prefix}
+else
+	cfa_prefix=${prefix}
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_PREFIX "${cfa_prefix}"
+_ACEOF
+
+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
+#define CFA_INCDIR "${cfa_incdir}"
+_ACEOF
+
+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
+#define CFA_BINDIR "${cfa_bindir}"
+_ACEOF
+
+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
+#define CFA_LIBDIR "${cfa_libdir}"
+_ACEOF
+
+CFA_LIBDIR=${cfa_libdir}