From: wolf Date: Tue, 12 Nov 2002 18:25:30 +0000 (+0000) Subject: Detect icc on Linux and windows. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9765884b1cd8ef0a17d08492bbc75c990b9ad6b;p=dealii-svn.git Detect icc on Linux and windows. git-svn-id: https://svn.dealii.org/trunk@6758 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 09e12ee1be..3a806dd84d 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -94,8 +94,11 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION=MIPSpro else - dnl Intel's ICC C++ compiler? - is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" + dnl Intel's ICC C++ compiler? On Linux, it uses -V, on Windows + dnl it is -help + is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" + is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel(R) C++ Compiler'`" + is_intel_icc="$is_intel_icc1$is_intel_icc2" if test "x$is_intel_icc" != "x" ; then AC_MSG_RESULT(C++ compiler is Intel ICC) GXX_VERSION=intel_icc diff --git a/deal.II/configure b/deal.II/configure index c0543bfe89..457aad15fe 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.126 . +# From configure.in Revision: 1.127 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.54. # @@ -2633,7 +2633,9 @@ echo "${ECHO_T}C++ compiler is MIPSpro C++ compiler" >&6 GXX_VERSION=MIPSpro else - is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" + is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" + is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel(R) C++ Compiler'`" + is_intel_icc="$is_intel_icc1$is_intel_icc2" if test "x$is_intel_icc" != "x" ; then echo "$as_me:$LINENO: result: C++ compiler is Intel ICC" >&5 echo "${ECHO_T}C++ compiler is Intel ICC" >&6