Changeset 210587b for configure

Timestamp:

Feb 20, 2017, 12:37:03 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

fc39193

Parents:

7fb1db7 (diff), 3bff885 (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 plg2:software/cfa/cfa-cc

File:

• configure (modified) (6 diffs)

configure

@@ -658 +658 @@
 CFA_INCDIR
 CFA_PREFIX
+BUILD_CONCURRENCY_FALSE
+BUILD_CONCURRENCY_TRUE
 BUILD_NO_LIB_FALSE
 BUILD_NO_LIB_TRUE
@@ -742 +744 @@
 enable_target_release
 enable_target_debug
+enable_threading
 enable_dependency_tracking
 '
@@ -1386 +1389 @@
   --enable-target-release Build and install the release target
   --enable-target-debug   Build and install the debug target
+  --enable-threading      Build and install libcfa with threading support
+                          (Enabled by default)
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
@@ -3123 +3128 @@
 fi
 
+# Check whether --enable-threading was given.
+if test "${enable_threading+set}" = set; then :
+  enableval=$enable_threading; case "${enableval}" in
+  yes) build_threading-"yes" ;;
+  no)  build_threading="no" ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
+esac
+else
+  build_threading="yes"
+fi
+
 
 case "$enable_target_release" in
@@ -3197 +3213 @@
   BUILD_NO_LIB_TRUE='#'
   BUILD_NO_LIB_FALSE=
+fi
+
+ if test "x$build_threading" = "xyes"; then
+  BUILD_CONCURRENCY_TRUE=
+  BUILD_CONCURRENCY_FALSE='#'
+else
+  BUILD_CONCURRENCY_TRUE='#'
+  BUILD_CONCURRENCY_FALSE=
 fi
 
@@ -6318 +6342 @@
 if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_CONCURRENCY_TRUE}" && test -z "${BUILD_CONCURRENCY_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_CONCURRENCY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi