From 0d7f2391e2ca0ea697ef4c85b3b1ea9c0ff303b0 Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 17 Sep 2004 23:34:00 +0000 Subject: [PATCH] Detect and accept gcc4 git-svn-id: https://svn.dealii.org/trunk@9631 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 14 +++++++++++++- deal.II/configure | 19 +++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b49b3da6ca..9ce5602869 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -80,6 +80,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is gcc-3.5) GXX_VERSION=gcc3.5 ;; + *version\ 4.0*) + AC_MSG_RESULT(C++ compiler is gcc-4.0) + GXX_VERSION=gcc4.0 + ;; *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 @@ -770,6 +774,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl AC_MSG_RESULT(C compiler is gcc-3.5) CC_VERSION=gcc3.5 ;; + *version\ 4.0*) + AC_MSG_RESULT(C compiler is gcc-4.0) + CC_VERSION=gcc4.0 + ;; *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) @@ -1084,6 +1092,10 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl AC_MSG_RESULT(F77 compiler is gcc-3.5) F77_VERSION=gcc3.5 ;; + *4.0*) + AC_MSG_RESULT(F77 compiler is gcc-4.0) + F77_VERSION=gcc4.0 + ;; *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 @@ -1161,7 +1173,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]]) + egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.[[012345]] | gcc4.0) F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" F77FLAGSO="$FFLAGS -O2" diff --git a/deal.II/configure b/deal.II/configure index cf2d8a9c9e..4ba51a18f7 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.176 . +# From configure.in Revision: 1.177 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -2880,6 +2880,11 @@ echo "${ECHO_T}C++ compiler is gcc-3.4" >&6 echo "${ECHO_T}C++ compiler is gcc-3.5" >&6 GXX_VERSION=gcc3.5 ;; + *version\ 4.0*) + echo "$as_me:$LINENO: result: C++ compiler is gcc-4.0" >&5 +echo "${ECHO_T}C++ compiler is gcc-4.0" >&6 + GXX_VERSION=gcc4.0 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION_STRING" >&5 echo "${ECHO_T}C++ compiler is $GXX_VERSION_STRING" >&6 @@ -3576,6 +3581,11 @@ echo "${ECHO_T}C compiler is gcc-3.4" >&6 echo "${ECHO_T}C compiler is gcc-3.5" >&6 CC_VERSION=gcc3.5 ;; + *version\ 4.0*) + echo "$as_me:$LINENO: result: C compiler is gcc-4.0" >&5 +echo "${ECHO_T}C compiler is gcc-4.0" >&6 + CC_VERSION=gcc4.0 + ;; *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 @@ -8165,6 +8175,11 @@ echo "${ECHO_T}F77 compiler is gcc-3.4" >&6 echo "${ECHO_T}F77 compiler is gcc-3.5" >&6 F77_VERSION=gcc3.5 ;; + *4.0*) + echo "$as_me:$LINENO: result: F77 compiler is gcc-4.0" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.0" >&6 + F77_VERSION=gcc4.0 + ;; *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 @@ -8220,7 +8235,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]) + egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.[012345] | gcc4.0) F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" F77FLAGSO="$FFLAGS -O2" -- 2.39.5