Detect gcc 4.0.2/3.

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index d92cec7146ee2cd05326b71defa99e0843951671..d22866f5e11bf048cdacb2719851f8a23d9bd68a 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -128,6 +128,8 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
         case "$GXX_VERSION_STRING" in
          *version\ 4.0.0*) GXX_VERSION_DETAILED=gcc4.0.0 ;;
          *version\ 4.0.1*) GXX_VERSION_DETAILED=gcc4.0.1 ;;
+         *version\ 4.0.2*) GXX_VERSION_DETAILED=gcc4.0.2 ;;
+         *version\ 4.0.3*) GXX_VERSION_DETAILED=gcc4.0.3 ;;
          *)                GXX_VERSION_DETAILED=gcc4.0.x ;;
         esac
        ;;

diff --git a/deal.II/configure b/deal.II/configure
index f5c511006426c8533f197ba41b824784396248f0..d0280abaa7a9dc70db5794ae295d357d61bb52bd 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.205 .
+# From configure.in Revision: 1.208 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -2929,6 +2929,8 @@ echo "${ECHO_T}C++ compiler is gcc-2.97" >&6
         case "$GXX_VERSION_STRING" in
          *version\ 4.0.0*) GXX_VERSION_DETAILED=gcc4.0.0 ;;
          *version\ 4.0.1*) GXX_VERSION_DETAILED=gcc4.0.1 ;;
+         *version\ 4.0.2*) GXX_VERSION_DETAILED=gcc4.0.2 ;;
+         *version\ 4.0.3*) GXX_VERSION_DETAILED=gcc4.0.3 ;;
          *)                GXX_VERSION_DETAILED=gcc4.0.x ;;
         esac
        ;;
@@ -3351,7 +3353,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
                                                                       CXXFLAGSO="$CXXFLAGS -D__sgi__ -O2 -no_auto_include -woff 1174,1552"
           CXXFLAGSPIC="-KPIC"
           LDFLAGSPIC="-KPIC"
-                    LDFLAGS="$LDFLAGS -quiet_prelink"
+                                                            LDFLAGS="$LDFLAGS -quiet_prelink -woff 131"
                                         LIBS="$LIBS -lm"
           ;;
 
@@ -8905,7 +8907,13 @@ if test "x$enableshared" = "xyes" ; then
   F77FLAGSG="$F77FLAGSG $F77FLAGSPIC"
   F77FLAGSO="$F77FLAGSO $F77FLAGSPIC"
 else
-  LDFLAGS="$LDFLAGS -static"
+  LDFLAGSSTATIC="-static"
+  case "$target" in
+    powerpc-apple-darwin* )
+       LDFLAGSSTATIC=""
+          ;;
+  esac
+  LDFLAGS="$LDFLAGS $LDFLAGSSTATIC"
 fi