]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Experimentally re-accept gcc 2.96
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 14 Oct 2002 14:38:55 +0000 (14:38 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 14 Oct 2002 14:38:55 +0000 (14:38 +0000)
git-svn-id: https://svn.dealii.org/trunk@6641 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4

index b58ccadda5bd19b553598a1bf6d8d61b370e88f2..71b833e7677e97f431459baf4c35d15b25882c14 100644 (file)
@@ -38,15 +38,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
        ;;
       *2.96*)
        AC_MSG_RESULT(C++ compiler is gcc-2.96)
-       dnl gcc 2.96 is so broken that there is no way to support it.
-       dnl thus, kick out user and ask him to up- or downgrade to
-       dnl some other gcc version
-       AC_MSG_RESULT( )
-       AC_MSG_RESULT(--------------------------------------------------------)
-       AC_MSG_RESULT(gcc 2.96 is not supported. Please read the deal.II FAQs.)
-       AC_MSG_RESULT(--------------------------------------------------------)
-       AC_MSG_RESULT( )
-       exit 1
+       GXX_VERSION=gcc2.96
        ;;
       *2.97*)
        AC_MSG_RESULT(C++ compiler is gcc-2.97)
@@ -538,11 +530,11 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl
       G77_VERSION_STRING="`($F77 -v 2>&1) | grep \"gcc version\"`"
       case "$G77_VERSION_STRING" in
         *"egcs-1.1"*)
-            AC_MSG_RESULT(F77 compiler is egcs-1.1)
-            F77_VERSION=egcs1.1
-            ;;
+          AC_MSG_RESULT(F77 compiler is egcs-1.1)
+          F77_VERSION=egcs1.1
+          ;;
         *2.95*)
-            AC_MSG_RESULT(F77 compiler is gcc-2.95)
+          AC_MSG_RESULT(F77 compiler is gcc-2.95)
          F77_VERSION=gcc2.95
          ;;
         *2.96*)
@@ -831,7 +823,9 @@ AC_DEFUN(DEAL_II_SET_MULTITHREADING_FLAGS, dnl
   
       CXXFLAGSG="$CXXFLAGSG -D_REENTRANT"
       CXXFLAGSO="$CXXFLAGSO -D_REENTRANT"
-      if test "$GXX_VERSION" = "gcc2.95" -o "$GXX_VERSION" = "gcc3.0" ; then
+      if test "$GXX_VERSION" = "gcc2.95" \
+              -o "$GXX_VERSION" = "gcc2.96" \
+             -o "$GXX_VERSION" = "gcc3.0" ; then
         CXXFLAGSG="$CXXFLAGSG -D__USE_MALLOC"
         CXXFLAGSO="$CXXFLAGSO -D__USE_MALLOC"
       fi

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.