Find a more robust way to do things.

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 0ef3ca0f7d5ee81dffe569edf73330805cb96848..58379b719ef56c79f65339f5a838f3f91ab53a63 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -234,16 +234,16 @@ 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 -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"
+        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'`"
-         version7="`echo $is_intel_icc | grep 'Version 7'`"
-         version8="`echo $is_intel_icc | grep 'Version 8'`"
-         version9="`echo $is_intel_icc | grep 'Version 9'`"
-         version10="`echo $is_intel_icc | grep 'Version 10'`"
+         version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`"
+         version5="`echo $version_string | grep 'Version 5'`"
+         version6="`echo $version_string | grep 'Version 6'`"
+         version7="`echo $version_string | grep 'Version 7'`"
+         version8="`echo $version_string | grep 'Version 8'`"
+         version9="`echo $version_string | grep 'Version 9'`"
+         version10="`echo $version_string | grep 'Version 10'`"
           if test "x$version5" != "x" ; then
             AC_MSG_RESULT(C++ compiler is icc-5)
             GXX_VERSION=intel_icc5
@@ -1093,17 +1093,17 @@ 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 -V 2>&1) | grep 'Version'`"
-        is_intel_icc3="`($CC -help 2>&1) | grep 'Intel'`"
+        is_intel_icc2="`($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_icc3$is_intel_ecc"
+       is_intel_icc="$is_intel_icc1$is_intel_icc2$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'`"
-         version7="`echo $is_intel_icc | grep 'Version 7'`"
-         version8="`echo $is_intel_icc | grep 'Version 8'`"
-         version9="`echo $is_intel_icc | grep 'Version 9'`"
-         version10="`echo $is_intel_icc | grep 'Version 10'`"
+         version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`"
+         version5="`echo $version_string | grep 'Version 5'`"
+         version6="`echo $version_string | grep 'Version 6'`"
+         version7="`echo $version_string | grep 'Version 7'`"
+         version8="`echo $version_string | grep 'Version 8'`"
+         version9="`echo $version_string | grep 'Version 9'`"
+         version10="`echo $version_string | grep 'Version 10'`"
           if test "x$version5" != "x" ; then
             AC_MSG_RESULT(C compiler is icc-5)
             CC_VERSION=intel_icc5

diff --git a/deal.II/configure b/deal.II/configure
index e784546d00f47afc5062db746377a1cfa71bcb09..1de1a9a21072f53001a132c4b1a26386039bbf6f 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -3101,16 +3101,16 @@ 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 -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"
+        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'`"
-         version7="`echo $is_intel_icc | grep 'Version 7'`"
-         version8="`echo $is_intel_icc | grep 'Version 8'`"
-         version9="`echo $is_intel_icc | grep 'Version 9'`"
-         version10="`echo $is_intel_icc | grep 'Version 10'`"
+         version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`"
+         version5="`echo $version_string | grep 'Version 5'`"
+         version6="`echo $version_string | grep 'Version 6'`"
+         version7="`echo $version_string | grep 'Version 7'`"
+         version8="`echo $version_string | grep 'Version 8'`"
+         version9="`echo $version_string | grep 'Version 9'`"
+         version10="`echo $version_string | grep 'Version 10'`"
           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
@@ -3543,14 +3543,21 @@ 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"
               ;;
            *)
-              CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
+             case "$target" in
+               *ia64*)
+                   CXXFLAGSO="$CXXFLAGSO -opt-report 0"
+                   ;;
+               *)
+                   CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
+                   ;;
+             esac
              ;;
           esac
 
@@ -4086,17 +4093,17 @@ 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 -V 2>&1) | grep 'Version'`"
-        is_intel_icc3="`($CC -help 2>&1) | grep 'Intel'`"
+        is_intel_icc2="`($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_icc3$is_intel_ecc"
+       is_intel_icc="$is_intel_icc1$is_intel_icc2$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'`"
-         version7="`echo $is_intel_icc | grep 'Version 7'`"
-         version8="`echo $is_intel_icc | grep 'Version 8'`"
-         version9="`echo $is_intel_icc | grep 'Version 9'`"
-         version10="`echo $is_intel_icc | grep 'Version 10'`"
+         version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`"
+         version5="`echo $version_string | grep 'Version 5'`"
+         version6="`echo $version_string | grep 'Version 6'`"
+         version7="`echo $version_string | grep 'Version 7'`"
+         version8="`echo $version_string | grep 'Version 8'`"
+         version9="`echo $version_string | grep 'Version 9'`"
+         version10="`echo $version_string | grep 'Version 10'`"
           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