Detect icc10.

git-svn-id: https://svn.dealii.org/trunk@14829 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index feb4714ce54b6c3c67851f9138fc414bd7a2693a..0c3a10cb79b5da2ddbf03925179f849ad53bd2ce 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -242,6 +242,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
          version7="`echo $is_intel_icc | grep 'Version 7'`"
          version8="`echo $is_intel_icc | grep 'Version 8'`"
          version9="`echo $is_intel_icc | grep 'Version 9'`"
+         version10="`echo $is_intel_icc | grep 'Version 10'`"
           if test "x$version5" != "x" ; then
             AC_MSG_RESULT(C++ compiler is icc-5)
             GXX_VERSION=intel_icc5
@@ -257,6 +258,9 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
           else if test "x$version9" != "x" ; then
             AC_MSG_RESULT(C++ compiler is icc-9)
             GXX_VERSION=intel_icc9
+          else if test "x$version10" != "x" ; then
+            AC_MSG_RESULT(C++ compiler is icc-10)
+            GXX_VERSION=intel_icc10
           else
             AC_MSG_RESULT(C++ compiler is icc)
             GXX_VERSION=intel_icc
@@ -1047,6 +1051,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl
          version7="`echo $is_intel_icc | grep 'Version 7'`"
          version8="`echo $is_intel_icc | grep 'Version 8'`"
          version9="`echo $is_intel_icc | grep 'Version 9'`"
+         version9="`echo $is_intel_icc | grep 'Version 10'`"
           if test "x$version5" != "x" ; then
             AC_MSG_RESULT(C compiler is icc-5)
             CC_VERSION=intel_icc5
@@ -1062,6 +1067,9 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl
           else if test "x$version9" != "x" ; then
             AC_MSG_RESULT(C compiler is icc-9)
             CC_VERSION=intel_icc9
+          else if test "x$version10" != "x" ; then
+            AC_MSG_RESULT(C compiler is icc-10)
+            CC_VERSION=intel_icc10
           else
             AC_MSG_RESULT(C compiler is icc)
             CC_VERSION=intel_icc

diff --git a/deal.II/configure b/deal.II/configure
index 1a6d4d459dfde5d61533746759ffe7634be57ee5..60dd304df2b01c561c17871e25bdcb1436ae40c0 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 14620 .
+# From configure.in Revision: 14622 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60 for deal.II 5.3.pre.
 #
@@ -3735,6 +3735,7 @@ echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler ver
          version7="`echo $is_intel_icc | grep 'Version 7'`"
          version8="`echo $is_intel_icc | grep 'Version 8'`"
          version9="`echo $is_intel_icc | grep 'Version 9'`"
+         version10="`echo $is_intel_icc | grep 'Version 10'`"
           if test "x$version5" != "x" ; then
             { echo "$as_me:$LINENO: result: C++ compiler is icc-5" >&5
 echo "${ECHO_T}C++ compiler is icc-5" >&6; }
@@ -3755,6 +3756,10 @@ echo "${ECHO_T}C++ compiler is icc-8" >&6; }
             { echo "$as_me:$LINENO: result: C++ compiler is icc-9" >&5
 echo "${ECHO_T}C++ compiler is icc-9" >&6; }
             GXX_VERSION=intel_icc9
+          else if test "x$version10" != "x" ; then
+            { echo "$as_me:$LINENO: result: C++ compiler is icc-10" >&5
+echo "${ECHO_T}C++ compiler is icc-10" >&6; }
+            GXX_VERSION=intel_icc10
           else
             { echo "$as_me:$LINENO: result: C++ compiler is icc" >&5
 echo "${ECHO_T}C++ compiler is icc" >&6; }
@@ -4775,6 +4780,7 @@ echo "${ECHO_T}C compiler is unknown version but accepted MIPSpro compiler versi
          version7="`echo $is_intel_icc | grep 'Version 7'`"
          version8="`echo $is_intel_icc | grep 'Version 8'`"
          version9="`echo $is_intel_icc | grep 'Version 9'`"
+         version9="`echo $is_intel_icc | grep 'Version 10'`"
           if test "x$version5" != "x" ; then
             { echo "$as_me:$LINENO: result: C compiler is icc-5" >&5
 echo "${ECHO_T}C compiler is icc-5" >&6; }
@@ -4795,6 +4801,10 @@ echo "${ECHO_T}C compiler is icc-8" >&6; }
             { echo "$as_me:$LINENO: result: C compiler is icc-9" >&5
 echo "${ECHO_T}C compiler is icc-9" >&6; }
             CC_VERSION=intel_icc9
+          else if test "x$version10" != "x" ; then
+            { echo "$as_me:$LINENO: result: C compiler is icc-10" >&5
+echo "${ECHO_T}C compiler is icc-10" >&6; }
+            CC_VERSION=intel_icc10
           else
             { echo "$as_me:$LINENO: result: C compiler is icc" >&5
 echo "${ECHO_T}C compiler is icc" >&6; }