From: bangerth Date: Tue, 15 Dec 2009 04:57:45 +0000 (+0000) Subject: Detect gcc 4.6. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ebb34d4668145134c337093910f7208b9f6dd81;p=dealii-svn.git Detect gcc 4.6. git-svn-id: https://svn.dealii.org/trunk@20249 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 94d4561542..afa4c41c2d 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -235,6 +235,15 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl *) GXX_VERSION_DETAILED=gcc4.5.x ;; esac ;; + *version\ 4.6*) + GXX_VERSION=gcc4.6 + case "$GXX_VERSION_STRING" in + *version\ 4.6.0*) GXX_VERSION_DETAILED=gcc4.6.0 ;; + *version\ 4.6.1*) GXX_VERSION_DETAILED=gcc4.6.1 ;; + *version\ 4.6.2*) GXX_VERSION_DETAILED=gcc4.6.2 ;; + *) GXX_VERSION_DETAILED=gcc4.6.x ;; + esac + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) dnl These compilers are too old to support a useful subset dnl of modern C++, so we don't support them @@ -1313,6 +1322,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl AC_MSG_RESULT(C compiler is gcc-4.5) CC_VERSION=gcc4.5 ;; + *version\ 4.6*) + AC_MSG_RESULT(C compiler is gcc-4.6) + CC_VERSION=gcc4.6 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) AC_MSG_RESULT(C compiler is $CC_VERSION_STRING) AC_MSG_ERROR(C compiler is not supported) @@ -1714,6 +1727,10 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl AC_MSG_RESULT(F77 compiler is gcc-4.5) F77_VERSION=gcc4.5 ;; + *version\ 4.6*) + AC_MSG_RESULT(F77 compiler is gcc-4.6) + F77_VERSION=gcc4.6 + ;; *) AC_MSG_RESULT(F77 compiler is unknown but accepted gcc version) F77_VERSION=gcc-other