Changeset 58fe85a for configure.ac

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into park_unpark

File:

• configure.ac (modified) (8 diffs)

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.68])
-AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
+AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
 AC_CONFIG_AUX_DIR([automake])
 AC_CONFIG_MACRO_DIRS([automake])
-#AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_HEADERS([config.h:src/config.h.in])
 AM_SILENT_RULES([yes])
 
-m4_include([automake/cfa.m4])
+m4_include([tools/build/cfa.m4])
 
 # don't use the default CFLAGS as they unconditonnaly add -O2
 : ${CFLAGS=""}
+: ${CXXFLAGS=""}
 
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -24 +24 @@
 #Trasforming cc1 will break compilation
 M4CFA_PROGRAM_NAME
+
+#==============================================================================
+# New AST toggling support
+AH_TEMPLATE([CFA_USE_NEW_AST],[Sets whether or not to use the new-ast, this is adefault value and can be overrided by --old-ast and --new-ast])
+DEFAULT_NEW_AST="True"
+AC_ARG_ENABLE(new-ast,
+        [  --enable-new-ast     whether or not to use new ast as the default AST algorithm],
+        [case "${enableval}" in
+                yes) newast=true ; DEFAULT_NEW_AST="True"  ;;
+                no)  newast=false; DEFAULT_NEW_AST="False" ;;
+                *) AC_MSG_ERROR([bad value ${enableval} for --enable-new-ast]) ;;
+        esac],[newast=true])
+AC_DEFINE_UNQUOTED([CFA_USE_NEW_AST], $newast)
+AC_SUBST(DEFAULT_NEW_AST)
 
 #==============================================================================
@@ -64 +78 @@
         enable_distcc=$enableval, enable_distcc=no)
 
+AC_ARG_WITH(bwlimit,
+        [  --with-bwlimit=RATE     RATE the maximum rate at which rsync will be limited when using distributed builds],
+        [], [])
+
 AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
 HAS_DISTCC="False"
@@ -85 +103 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
-TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"
+TOP_SRCDIR="$(readlink -e $ac_abs_confdir/)/"
+TOP_BUILDDIR="$(readlink -e $ac_pwd/)/"
 
 AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])
@@ -121 +139 @@
                 \'--enable-gprofiler=*) ;;
                 \'--disable-gprofiler) ;;
+
+                # skip the target hosts
+                \'--enable-new-ast=*) ;;
+                \'--disable-new-ast) ;;
+
+                # skip this, it only causes problems
+                \'--srcdir=*) ;;
 
                 # append all other arguments to the sub configure arguments
@@ -186 +211 @@
 
         LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
+        LIBCFA_1TARGET_DIR="${lib_dir}"
         LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
 
@@ -197 +223 @@
 
 AC_SUBST(LIBCFA_TARGET_DIRS)
+AC_SUBST(LIBCFA_1TARGET_DIR)
 AC_SUBST(LIBCFA_TARGET_MAKEFILES)
 
@@ -262 +289 @@
         driver/Makefile
         src/Makefile
-        benchmark/Makefile
+        libcfa/Makefile:libcfa/Makefile.dist.in
         tests/Makefile
-        longrun_tests/Makefile
-        tools/Makefile
-        tools/prettyprinter/Makefile
         ])
+
+# Some of our makefile don't need to be distributed
+AM_CONDITIONAL([CFORALL_DISTRIBUTE], [test -e $TOP_SRCDIR/autogen.sh])
+AM_COND_IF([CFORALL_DISTRIBUTE], [
+        AC_CONFIG_FILES([
+                longrun_tests/Makefile
+                benchmark/Makefile
+                benchmark/io/http/Makefile
+                tools/Makefile
+                tools/prettyprinter/Makefile
+        ])
+
+        AC_OUTPUT(benchmark/Cargo.toml)
+])
 
 AC_CONFIG_LINKS([tests/test.py:tests/test.py])