From 480bdda4d630ec3fe24811362b1d5c273544b88a Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 17 Mar 2008 03:27:04 +0000 Subject: [PATCH] Detect current gcc mainline after gcc4.3 branched. git-svn-id: https://svn.dealii.org/trunk@15892 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 15 ++++++++++++++- deal.II/configure | 20 +++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index e4ad2140de..cd65cec506 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -164,6 +164,15 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl *) GXX_VERSION_DETAILED=gcc4.3.x ;; esac ;; + *version\ 4.4*) + GXX_VERSION=gcc4.4 + case "$GXX_VERSION_STRING" in + *version\ 4.4.0*) GXX_VERSION_DETAILED=gcc4.4.0 ;; + *version\ 4.4.1*) GXX_VERSION_DETAILED=gcc4.4.1 ;; + *version\ 4.4.2*) GXX_VERSION_DETAILED=gcc4.4.2 ;; + *) GXX_VERSION_DETAILED=gcc4.4.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 @@ -1045,6 +1054,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl AC_MSG_RESULT(C compiler is gcc-4.3) CC_VERSION=gcc4.3 ;; + *version\ 4.4*) + AC_MSG_RESULT(C compiler is gcc-4.4) + CC_VERSION=gcc4.4 + ;; *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) @@ -3590,7 +3603,7 @@ AC_DEFUN(DEAL_II_CHECK_WEAK_LINKAGE_BUG, dnl case "$target" in *-apple-darwin* ) - AC_MSG_CHECKING(for weak linkage bug (Apple gcc.3.3) ) + AC_MSG_CHECKING(for weak linkage bug (Apple gcc3.3) ) dnl Create 1st testfile echo "template void SYMBOL() {}" > conftest.cc diff --git a/deal.II/configure b/deal.II/configure index 74f8ddffad..529266de22 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 15640 . +# From configure.in Revision: 15849 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for deal.II 6.1.pre. # @@ -3539,6 +3539,15 @@ echo "${ECHO_T}C++ compiler is gcc-2.97" >&6; } *) GXX_VERSION_DETAILED=gcc4.3.x ;; esac ;; + *version\ 4.4*) + GXX_VERSION=gcc4.4 + case "$GXX_VERSION_STRING" in + *version\ 4.4.0*) GXX_VERSION_DETAILED=gcc4.4.0 ;; + *version\ 4.4.1*) GXX_VERSION_DETAILED=gcc4.4.1 ;; + *version\ 4.4.2*) GXX_VERSION_DETAILED=gcc4.4.2 ;; + *) GXX_VERSION_DETAILED=gcc4.4.x ;; + esac + ;; *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; } @@ -4516,6 +4525,11 @@ echo "${ECHO_T}C compiler is gcc-4.2" >&6; } echo "${ECHO_T}C compiler is gcc-4.3" >&6; } CC_VERSION=gcc4.3 ;; + *version\ 4.4*) + { echo "$as_me:$LINENO: result: C compiler is gcc-4.4" >&5 +echo "${ECHO_T}C compiler is gcc-4.4" >&6; } + CC_VERSION=gcc4.4 + ;; *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; } @@ -6948,8 +6962,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext case "$target" in *-apple-darwin* ) - { echo "$as_me:$LINENO: checking for weak linkage bug (Apple gcc.3.3) " >&5 -echo $ECHO_N "checking for weak linkage bug (Apple gcc.3.3) ... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for weak linkage bug (Apple gcc3.3) " >&5 +echo $ECHO_N "checking for weak linkage bug (Apple gcc3.3) ... $ECHO_C" >&6; } echo "template void SYMBOL() {}" > conftest.cc echo "int g() { SYMBOL<1> (); }" >> conftest.cc -- 2.39.5