Changeset 48f6252 for configure.ac

Timestamp:

Dec 8, 2020, 6:40:21 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

364a03c

Parents:

0f7a0ea (diff), d7a10af (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• configure.ac (modified) (6 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])
@@ -28 +28 @@
 # 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="False"
+DEFAULT_NEW_AST="True"
 AC_ARG_ENABLE(new-ast,
         [  --enable-new-ast     whether or not to use new ast as the default AST algorithm],
@@ -35 +35 @@
                 no)  newast=false; DEFAULT_NEW_AST="False" ;;
                 *) AC_MSG_ERROR([bad value ${enableval} for --enable-new-ast]) ;;
-        esac],[newast=false])
+        esac],[newast=true])
 AC_DEFINE_UNQUOTED([CFA_USE_NEW_AST], $newast)
 AC_SUBST(DEFAULT_NEW_AST)
@@ -103 +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])
@@ -139 +139 @@
                 \'--enable-gprofiler=*) ;;
                 \'--disable-gprofiler) ;;
+
+                # skip the target hosts
+                \'--enable-new-ast=*) ;;
+                \'--disable-new-ast) ;;
 
                 # skip this, it only causes problems
@@ -287 +291 @@
         libcfa/Makefile:libcfa/Makefile.dist.in
         tests/Makefile
-        longrun_tests/Makefile
-        benchmark/Makefile
-        benchmark/io/http/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
+                ])])
+
 AC_CONFIG_LINKS([tests/test.py:tests/test.py])