dnl -------------------------------------------------------------
AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
[
+ dnl It used to be the case that AC_PROG_CXX could properly detect
+ dnl whether we are working with gcc or not, but then Intel came across
+ dnl the brilliant idea to disguise it's compiler as gcc by setting
+ dnl GCC preprocessor variables for versions etc. So we have to figure
+ dnl out again whether this is really gcc
+ if test "$GXX" = "yes" ; then
+ GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
+ if test "x$GXX_VERSION_STRING" = "x" ; then
+ GXX=no
+ fi
+ fi
+
if test "$GXX" = yes ; then
dnl find out the right version
GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
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'`"
if test "x$version5" != "x" ; then
AC_MSG_RESULT(C++ compiler is Intel ICC 5)
GXX_VERSION=intel_icc5
else if test "x$version7" != "x" ; then
AC_MSG_RESULT(C++ compiler is Intel ICC 7)
GXX_VERSION=intel_icc7
+ else if test "x$version8" != "x" ; then
+ AC_MSG_RESULT(C++ compiler is Intel ICC 8)
+ GXX_VERSION=intel_icc8
else
AC_MSG_RESULT(C++ compiler is Intel ICC)
GXX_VERSION=intel_icc
- fi fi fi
+ fi fi fi fi
else
dnl Or DEC's cxx compiler?
+ if test "$GXX" = "yes" ; then
+ GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
+ if test "x$GXX_VERSION_STRING" = "x" ; then
+ GXX=no
+ fi
+ fi
+
if test "$GXX" = yes ; then
GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
case "$GXX_VERSION_STRING" in
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'`"
if test "x$version5" != "x" ; then
echo "$as_me:$LINENO: result: C++ compiler is Intel ICC 5" >&5
echo "${ECHO_T}C++ compiler is Intel ICC 5" >&6
echo "$as_me:$LINENO: result: C++ compiler is Intel ICC 7" >&5
echo "${ECHO_T}C++ compiler is Intel ICC 7" >&6
GXX_VERSION=intel_icc7
+ else if test "x$version8" != "x" ; then
+ echo "$as_me:$LINENO: result: C++ compiler is Intel ICC 8" >&5
+echo "${ECHO_T}C++ compiler is Intel ICC 8" >&6
+ GXX_VERSION=intel_icc8
else
echo "$as_me:$LINENO: result: C++ compiler is Intel ICC" >&5
echo "${ECHO_T}C++ compiler is Intel ICC" >&6
GXX_VERSION=intel_icc
- fi fi fi
+ fi fi fi fi
else
is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`"
;;
portland_group)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -g --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175"
- CXXFLAGSO="$CXXFLAGS -fast -O2 --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175"
+ CXXFLAGSG="$CXXFLAGS -DDEBUG -g --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175 --diag_suppress 284"
+ CXXFLAGSO="$CXXFLAGS -fast -O2 --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175 --diag_suppress 284"
CXXFLAGSPIC="-Kpic"
;;