From: Wolfgang Bangerth Date: Thu, 1 Dec 2005 21:24:23 +0000 (+0000) Subject: Detect icc9. X-Git-Tag: v8.0.0~12832 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff50a0b20074c9501e2c6feae3b273ab569d7d8e;p=dealii.git Detect icc9. git-svn-id: https://svn.dealii.org/trunk@11804 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 3c50c77f5e..637d1b0a01 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -232,6 +232,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl version6="`echo $is_intel_icc | grep 'Version 6'`" version7="`echo $is_intel_icc | grep 'Version 7'`" version8="`echo $is_intel_icc | grep 'Version 8'`" + version9="`echo $is_intel_icc | grep 'Version 9'`" if test "x$version5" != "x" ; then AC_MSG_RESULT(C++ compiler is icc-5) GXX_VERSION=intel_icc5 @@ -244,10 +245,13 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl else if test "x$version8" != "x" ; then AC_MSG_RESULT(C++ compiler is icc-8) GXX_VERSION=intel_icc8 + else if test "x$version9" != "x" ; then + AC_MSG_RESULT(C++ compiler is icc-9) + GXX_VERSION=intel_icc9 else AC_MSG_RESULT(C++ compiler is icc) GXX_VERSION=intel_icc - fi fi fi fi + fi fi fi fi fi GXX_VERSION_DETAILED=$GXX_VERSION else @@ -988,6 +992,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl version6="`echo $is_intel_icc | grep 'Version 6'`" version7="`echo $is_intel_icc | grep 'Version 7'`" version8="`echo $is_intel_icc | grep 'Version 8'`" + version9="`echo $is_intel_icc | grep 'Version 9'`" if test "x$version5" != "x" ; then AC_MSG_RESULT(C compiler is icc-5) CC_VERSION=intel_icc5 @@ -1000,6 +1005,9 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl else if test "x$version8" != "x" ; then AC_MSG_RESULT(C compiler is icc-8) CC_VERSION=intel_icc8 + else if test "x$version9" != "x" ; then + AC_MSG_RESULT(C compiler is icc-9) + CC_VERSION=intel_icc9 else AC_MSG_RESULT(C compiler is icc) CC_VERSION=intel_icc diff --git a/deal.II/configure b/deal.II/configure index cef19c90b1..aa6188562f 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3045,6 +3045,7 @@ echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler ver version6="`echo $is_intel_icc | grep 'Version 6'`" version7="`echo $is_intel_icc | grep 'Version 7'`" version8="`echo $is_intel_icc | grep 'Version 8'`" + version9="`echo $is_intel_icc | grep 'Version 9'`" 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 @@ -3061,11 +3062,15 @@ echo "${ECHO_T}C++ compiler is icc-7" >&6 echo "$as_me:$LINENO: result: C++ compiler is icc-8" >&5 echo "${ECHO_T}C++ compiler is icc-8" >&6 GXX_VERSION=intel_icc8 + else if test "x$version9" != "x" ; then + 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 echo "$as_me:$LINENO: result: C++ compiler is icc" >&5 echo "${ECHO_T}C++ compiler is icc" >&6 GXX_VERSION=intel_icc - fi fi fi fi + fi fi fi fi fi GXX_VERSION_DETAILED=$GXX_VERSION else