Changeset 66f8528 for configure.ac

Timestamp:

Dec 15, 2016, 5:16:42 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -53 +53 @@
 AC_SUBST(CFA_BACKEND_CC)
 
+
+
+AC_ARG_ENABLE(target-release, AS_HELP_STRING([--enable-target-release], [Build and install the release target]))
+AC_ARG_ENABLE(target-debug, AS_HELP_STRING([--enable-target-debug], [Build and install the debug target]))
+
+case "$enable_target_release" in
+        yes)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="yes"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                esac
+                ;;
+        no)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="no"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                esac
+                ;;
+        *)
+                case "$enable_target_debug" in
+                        yes)
+                                build_release="no"
+                                build_debug="yes"
+                                ;;
+                        no)
+                                build_release="yes"
+                                build_debug="no"
+                                ;;
+                        *)
+                                build_release="yes"
+                                build_debug="yes"
+                                ;;
+                esac
+                ;;
+esac
+
+AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
+AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
+AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
+
 if test "x$prefix" = "xNONE"; then
         cfa_prefix=${ac_default_prefix}
@@ -87 +147 @@
 AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
 AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
+
+AC_CANONICAL_HOST
+AC_SUBST([MACHINE_TYPE],[$host_cpu])
 
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
+AM_PROG_AS
 AM_PROG_CC_C_O  # deprecated
 # These are often not installed and people miss seeing the "no", so stop the configure.
@@ -128 +192 @@
         src/examples/Makefile
         src/tests/Makefile
+        src/prelude/Makefile
         src/libcfa/Makefile
         ])
@@ -133 +198 @@
 AC_OUTPUT
 
+AM_COND_IF([BUILD_RELEASE],
+        [AM_COND_IF([BUILD_DEBUG],
+                [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
+                [AC_MSG_NOTICE(Building libcfa for target: release)])],
+        [AM_COND_IF([BUILD_DEBUG],
+                [AC_MSG_NOTICE(Building libcfa for target: debug)],
+                [AC_MSG_NOTICE(Running cfa without libcfa)])])
+
 # Final text
 AC_MSG_RESULT(Cforall configuraton completed. Type "make -j 8 install".)