From bd958111b621594b1dcf57c713bb012986f012f8 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 24 Oct 2006 21:57:48 +0000 Subject: [PATCH] Make detection of icc more robust. git-svn-id: https://svn.dealii.org/trunk@14069 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 12 +++--------- deal.II/configure | 7 +++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 883fad7a7f..5c0ed9aa4a 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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'`" diff --git a/deal.II/configure b/deal.II/configure index 31147d8777..0225e17f75 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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'`" -- 2.39.5