Detect current gcc mainline after gcc4.3 branched.

git-svn-id: https://svn.dealii.org/trunk@15892 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index e4ad2140dec346e63a618d0e4cd82b0b4de3a2ee..cd65cec5062ff9040d58b230a8e41304e1bf9054 100644 (file)
--- 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 <int> void SYMBOL() {}" >  conftest.cc

diff --git a/deal.II/configure b/deal.II/configure
index 74f8ddffad8231486e819d0638bd83a3f07bfd96..529266de22bb99f87abc6524d974410ce5dd343e 100755 (executable)
--- 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 <int> void SYMBOL() {}" >  conftest.cc
     echo "int g() { SYMBOL<1> (); }" >>  conftest.cc