The Intel icc 9.1 compiler doesn't print 'Intel' on the same line as 'Version', and...

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 55346957e7d64f696dffb5cd65b6b18e5959bc0d..0ef3ca0f7d5ee81dffe569edf73330805cb96848 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -234,8 +234,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
         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"
+        is_intel_icc2="`($CXX -V 2>&1) | grep 'Version'`"
+        is_intel_icc3="`($CXX -help 2>&1) | grep 'Intel'`"
+       is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_icc3"
         if test "x$is_intel_icc" != "x" ; then
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"
@@ -1092,9 +1093,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl
        dnl so join this one to the previous one with a little bit of
        dnl perl.
         is_intel_icc1="`($CC -V 2>&1) | grep 'Intel'`"
-        is_intel_icc2="`($CC -help 2>&1) | grep 'Intel'`"
+        is_intel_icc2="`($CC -V 2>&1) | grep 'Version'`"
+        is_intel_icc3="`($CC -help 2>&1) | grep 'Intel'`"
         is_intel_ecc="`($CC -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_icc="$is_intel_icc1$is_intel_icc2$is_intel_icc3$is_intel_ecc"
         if test "x$is_intel_icc" != "x" ; then
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"

diff --git a/deal.II/configure b/deal.II/configure
index f7f08d8df6c268ab8e8d043f87e767f27babd132..e784546d00f47afc5062db746377a1cfa71bcb09 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -3101,8 +3101,9 @@ echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler ver
       else
 
                        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"
+        is_intel_icc2="`($CXX -V 2>&1) | grep 'Version'`"
+        is_intel_icc3="`($CXX -help 2>&1) | grep 'Intel'`"
+       is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_icc3"
         if test "x$is_intel_icc" != "x" ; then
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"
@@ -3542,21 +3543,14 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
                                                                                                                                                                            CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858"
           CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11"
 
-                                                                                         case "$GXX_VERSION" in
+                                                                 case "$GXX_VERSION" in
            intel_icc5)
               ;;
            intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9)
               CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin"
               ;;
            *)
-             case "$target" in
-               *ia64*)
-                   CXXFLAGSO="$CXXFLAGSO -opt-report 0"
-                   ;;
-               *)
-                   CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
-                   ;;
-             esac
+              CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
              ;;
           esac
 
@@ -4092,9 +4086,10 @@ echo "${ECHO_T}C compiler is unknown version but accepted MIPSpro compiler versi
       else
 
                                                                is_intel_icc1="`($CC -V 2>&1) | grep 'Intel'`"
-        is_intel_icc2="`($CC -help 2>&1) | grep 'Intel'`"
+        is_intel_icc2="`($CC -V 2>&1) | grep 'Version'`"
+        is_intel_icc3="`($CC -help 2>&1) | grep 'Intel'`"
         is_intel_ecc="`($CC -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_icc="$is_intel_icc1$is_intel_icc2$is_intel_icc3$is_intel_ecc"
         if test "x$is_intel_icc" != "x" ; then
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"