]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Detect icc on Linux and windows.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 12 Nov 2002 18:25:30 +0000 (18:25 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 12 Nov 2002 18:25:30 +0000 (18:25 +0000)
git-svn-id: https://svn.dealii.org/trunk@6758 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 09e12ee1be24ea14c862b5560cec514c10120621..3a806dd84d85011b9cca99d29a3720716aba0b73 100644 (file)
@@ -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
index c0543bfe8913b3478ce8511ba279c06af9d9ebeb..457aad15fe29b23ae125685f17b554067b819d3a 100755 (executable)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.