]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Also identify Intel C compiler as such despite its best attempt at misidentifying...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 6 Nov 2011 14:08:41 +0000 (14:08 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 6 Nov 2011 14:08:41 +0000 (14:08 +0000)
git-svn-id: https://svn.dealii.org/trunk@24726 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure
deal.II/doc/news/changes.h

index 26d5548ed02e5bab864919209b56a7c7ea4102c9..57e6fd4022822a463365cf86cf4c9253a317af34 100644 (file)
@@ -1237,10 +1237,20 @@ dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl
 [
   if test "$GCC" = "yes" ; then
+    dnl Verify that we indeed have a compiler that identifies
+    dnl itself as GCC
     CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"`
     if test "x$CC_VERSION_STRING" = "x" ; then
       GCC=no
     fi
+
+    dnl Then icc came along and started to identify itself as
+    dnl    icc version 12.1.0 (gcc version 4.2.1 compatibility)
+    dnl which also doesn't help...
+    CC_VERSION_STRING=`($CC -v 2>&1) | grep "icc"`
+    if test "x$CC_VERSION_STRING" != "x" ; then
+      GCC=no
+    fi
   fi
 
   if test "$GCC" = yes ; then
index 203928a9e0c3262fe3d35a47c7179d596ed06f24..3ecc6dd83643e1978581ba6782119e1eaceefc4e 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 24565 .
+# From configure.in Revision: 24724 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for deal.II 7.2.pre.
 #
@@ -5070,9 +5070,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   if test "$GCC" = "yes" ; then
-    CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"`
+            CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"`
     if test "x$CC_VERSION_STRING" = "x" ; then
       GCC=no
+    fi
+
+                CC_VERSION_STRING=`($CC -v 2>&1) | grep "icc"`
+    if test "x$CC_VERSION_STRING" != "x" ; then
+      GCC=no
     fi
   fi
 
index 57e437c3d16af32449d1bc3be8d196d40dd6b400..257060496732a594526041befd18d3e8e42dfbbf 100644 (file)
@@ -43,7 +43,7 @@ these should really be unambiguous.
 
 <li> Fixed: Intel's ICC compiler identifies itself as <code>icpc version
 12.1.0 (gcc version 4.2.1 compatibility)</code> which we mistook as being
-GCC version 4.2. This is now fixed.
+GCC version 4.2. The same is true for the Intel C compiler. This is now fixed.
 <br>
 (Wolfgang Bangerth, 2011/11/05)
 

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.