From 78d73e74ff972543ba94ff6ce320d75594f928fc Mon Sep 17 00:00:00 2001
From: Alexander Voigt <Alexander.Voigt@desy.de>
Date: Wed, 7 Jan 2015 23:00:46 +0100
Subject: [PATCH] disable multi-threading for icpc 12 and 13

Patch: Jae-hyeon and Alex
---
 configure | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/configure b/configure
index ef2ce9dd7..3923fbcd2 100755
--- a/configure
+++ b/configure
@@ -1240,6 +1240,27 @@ check_cxx_compiler_version() {
     logmsg "   $CXX version found: $cxx_compiler_version"
 }
 
+#_____________________________________________________________________
+check_icpc_features() {
+    local compiler="$1"
+    local version="$2"
+
+    checking_msg "$compiler compiler features"
+
+    local major minor patch
+    split_version "$version" major minor patch
+
+    # disable multi-threading for versions < 14.0.0
+    if ! major_minor_patch_at_least $major $minor $patch "14" "0" "0" &&
+       [ "$enable_threads" = "yes" ]; then
+	message ""
+	message "   Warning: multi-threading support requires $compiler 14.0.0 or newer."
+	enable_threads="no"
+    else
+	result "ok"
+    fi
+}
+
 #_____________________________________________________________________
 check_cxx_dep_gen_type() {
     checking_msg "type of C++ file dependency generator ${CXX_DEP_GEN}"
@@ -1359,6 +1380,13 @@ get_icpc_version() {
     eval "$ret_var=\"$version\""
 }
 
+#_____________________________________________________________________
+check_cxx_compiler_features() {
+    case "$cxx_compiler_type" in
+    intel) check_icpc_features "$CXX" "$cxx_compiler_version" ;;
+    esac
+}
+
 #_____________________________________________________________________
 get_clang_version() {
     if test $# -ne 2; then
@@ -2226,6 +2254,7 @@ if test "x${enable_compile}" = "xyes"; then
     check_cxx
     check_cxx_compiler_type
     check_cxx_compiler_version
+    check_cxx_compiler_features
     check_cxxflags
     check_cxx_dep_gen
     check_cxx_dep_gen_type