]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make detection of icc more robust.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 24 Oct 2006 21:57:48 +0000 (21:57 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 24 Oct 2006 21:57:48 +0000 (21:57 +0000)
git-svn-id: https://svn.dealii.org/trunk@14069 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 883fad7a7ff666e2524047a0a7c2b56a67e6b5c1..5c0ed9aa4afd36383679463e8836411194e966ce 100644 (file)
@@ -223,15 +223,9 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
   
         dnl Intel's ICC C++ compiler? On Linux, it uses -V, on Windows
        dnl it is -help
-       dnl
-       dnl Annoyingly, ecc6.0 prints its version number on a separate
-       dnl line (the previous one ends with the string "applications"),
-       dnl so join this one to the previous one with a little bit of
-       dnl perl.
-        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_ecc="`($CXX -V 2>&1) | perl -pi -e 's/applications\n/\1/g;' | grep 'Intel(R) C++ Itanium(TM) Compiler'`"
-       is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc"
+        is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel'`"
+        is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel'`"
+       is_intel_icc="$is_intel_icc1$is_intel_icc2"
         if test "x$is_intel_icc" != "x" ; then
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"
index 31147d8777e16106a7cee4ad5ee585d76faabc3e..0225e17f756966b401d202679ecb4a4ec9814e59 100755 (executable)
@@ -3089,10 +3089,9 @@ echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler ver
         esac
       else
 
-                                                               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_ecc="`($CXX -V 2>&1) | perl -pi -e 's/applications\n/\1/g;' | grep 'Intel(R) C++ Itanium(TM) Compiler'`"
-       is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc"
+                       is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel'`"
+        is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel'`"
+       is_intel_icc="$is_intel_icc1$is_intel_icc2"
         if test "x$is_intel_icc" != "x" ; then
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 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.