Changeset 4a60488 for configure.ac

Timestamp:

Sep 27, 2019, 3:35:46 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -58 +58 @@
 
 #==============================================================================
+# distcc support
+
+AC_ARG_ENABLE(distcc,
+        [  --enable-distcc     whether or not to enable distributed compilation],
+        enable_distcc=$enableval, enable_distcc=no)
+
+AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
+HAS_DISTCC="False"
+
+if test x$enable_distcc = xyes; then
+        CXX="distcc ${CXX}"
+        LD="distcc ${LD} -lstdc++"
+        HAS_DISTCC="True"
+        echo "Enabling distributed builds"
+fi
+
+AC_SUBST(CXX)
+AC_SUBST(LD)
+AC_SUBST(HAS_DISTCC)
+
+#==============================================================================
 # Installation paths
 M4CFA_PARSE_PREFIX
@@ -72 +93 @@
 DRIVER_DIR=${TOP_BUILDDIR}driver/
 CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
 CFACPP=${DRIVER_DIR}cfa-cpp
 AC_SUBST(DRIVER_DIR)
 AC_SUBST(CFACC)
+AC_SUBST(CFACC_INSTALL)
 AC_SUBST(CFACPP)
 
@@ -133 +156 @@
         enable_gprofiler=$enableval, enable_gprofiler=yes)
 
+AC_ARG_ENABLE(demangler,
+        [  --enable-demangler     whether or not to build the demangler (executable and library)],
+        enable_demangler=$enableval, enable_demangler=yes)
+
 AC_SUBST(TARGET_HOSTS, ${target_hosts})
 
@@ -205 +232 @@
 AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1])
 
+# conditionnally build the demangler
+if test "x$enable_demangler" == xyes; then
+        LIBDEMANGLE="libdemangle.a"
+        DEMANGLER="demangler"
+else
+        LIBDEMANGLE=""
+        DEMANGLER=""
+fi
+AC_SUBST([LIBDEMANGLE])
+AC_SUBST([DEMANGLER])
+
 # Checks for header files.
 AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1])