From b51a5585d4b539582c3bba83e22c344617823a30 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 21 Jun 2005 18:32:23 +0000 Subject: [PATCH] Missed a few places for detecting gcc4.1 git-svn-id: https://svn.dealii.org/trunk@10909 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 10 +++++++++- deal.II/configure | 12 +++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index cd1d54cf40..fdac80f1e0 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -859,6 +859,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl AC_MSG_RESULT(C compiler is gcc-4.0) CC_VERSION=gcc4.0 ;; + *version\ 4.1*) + AC_MSG_RESULT(C compiler is gcc-4.1) + CC_VERSION=gcc4.1 + ;; *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) @@ -1186,6 +1190,10 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl AC_MSG_RESULT(F77 compiler is gcc-4.0) F77_VERSION=gcc4.0 ;; + *4.1*) + AC_MSG_RESULT(F77 compiler is gcc-4.1) + F77_VERSION=gcc4.1 + ;; *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. gcc2.7.2 is @@ -1272,7 +1280,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl [ case "$F77_VERSION" in - egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.[[012345]] | gcc4.0) + egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc[34].*) F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" F77FLAGSO="$FFLAGS -O2" diff --git a/deal.II/configure b/deal.II/configure index 54918f94c6..889b2a5281 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3735,6 +3735,11 @@ echo "${ECHO_T}C compiler is gcc-3.5" >&6 echo "${ECHO_T}C compiler is gcc-4.0" >&6 CC_VERSION=gcc4.0 ;; + *version\ 4.1*) + echo "$as_me:$LINENO: result: C compiler is gcc-4.1" >&5 +echo "${ECHO_T}C compiler is gcc-4.1" >&6 + CC_VERSION=gcc4.1 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) echo "$as_me:$LINENO: result: C compiler is $CC_VERSION_STRING" >&5 echo "${ECHO_T}C compiler is $CC_VERSION_STRING" >&6 @@ -8554,6 +8559,11 @@ echo "${ECHO_T}F77 compiler is gcc-3.5" >&6 echo "${ECHO_T}F77 compiler is gcc-4.0" >&6 F77_VERSION=gcc4.0 ;; + *4.1*) + echo "$as_me:$LINENO: result: F77 compiler is gcc-4.1" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.1" >&6 + F77_VERSION=gcc4.1 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) echo "$as_me:$LINENO: result: F77 compiler is $G77_VERSION_STRING" >&5 echo "${ECHO_T}F77 compiler is $G77_VERSION_STRING" >&6 @@ -8620,7 +8630,7 @@ echo "${ECHO_T}F77 compiler is unkown. no flags set!" >&6 case "$F77_VERSION" in - egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.[012345] | gcc4.0) + egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc34.*) F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" F77FLAGSO="$FFLAGS -O2" -- 2.39.5