]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Detect gcc3.4.6
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 2 Jan 2006 16:06:59 +0000 (16:06 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 2 Jan 2006 16:06:59 +0000 (16:06 +0000)
git-svn-id: https://svn.dealii.org/trunk@11936 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 2d43a79d319d27ad10098d82cface2429423b8a9..0dc0ebb82b5ddc8dee320bcb442d31f3393b2331 100644 (file)
@@ -9,7 +9,7 @@ dnl    In doc/Makefile some information on the kind of documentation
 dnl    is stored.
 dnl
 dnl
-dnl Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors
+dnl Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors
 dnl
 dnl $Id$
 
@@ -119,6 +119,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
          *version\ 3.4.3*) GXX_VERSION_DETAILED=gcc3.4.3 ;;
          *version\ 3.4.4*) GXX_VERSION_DETAILED=gcc3.4.4 ;;
          *version\ 3.4.5*) GXX_VERSION_DETAILED=gcc3.4.5 ;;
+         *version\ 3.4.6*) GXX_VERSION_DETAILED=gcc3.4.6 ;;
          *)                GXX_VERSION_DETAILED=gcc3.4.x ;;
         esac
        GXX_VERSION=gcc3.4
index 805cb961ab2a09834f44c447bc24b332539e7c6f..182b68012cb359e660b3655469fd65478adb5c58 100755 (executable)
@@ -2937,6 +2937,7 @@ echo "${ECHO_T}C++ compiler is gcc-2.97" >&6
          *version\ 3.4.3*) GXX_VERSION_DETAILED=gcc3.4.3 ;;
          *version\ 3.4.4*) GXX_VERSION_DETAILED=gcc3.4.4 ;;
          *version\ 3.4.5*) GXX_VERSION_DETAILED=gcc3.4.5 ;;
+         *version\ 3.4.6*) GXX_VERSION_DETAILED=gcc3.4.6 ;;
          *)                GXX_VERSION_DETAILED=gcc3.4.x ;;
         esac
        GXX_VERSION=gcc3.4
@@ -3183,7 +3184,7 @@ echo "${ECHO_T}Unrecognized C++ compiler -- Try to go ahead and get help from de
        ;;
 
       *cygwin* )
-                                                                CXXFLAGSPIC=
+                                                                       CXXFLAGSPIC=
        LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition"
         SHLIBFLAGS="$SHLIBFLAGS -Xlinker --allow-multiple-definition"
         ;;
@@ -10740,10 +10741,9 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 

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.