Changeset 08ce416 for configure.ac

Timestamp:

Dec 7, 2020, 12:57:06 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a468e1e9

Parents:

ad915e0

Message:

Changed configure to use new-ast by default.
Ast options no longer pushed to libcfa (that didn't make sense).
Long Run tests and benchmark no longer distributed.
Added missing source to distribution.
Added pybin to distribution.

File:

• configure.ac (modified) (4 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])
@@ -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)
@@ -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])