From: Wolfgang Bangerth Date: Mon, 2 Jan 2006 16:06:59 +0000 (+0000) Subject: Detect gcc3.4.6 X-Git-Tag: v8.0.0~12723 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1689f91a82cabcd10c6968b99bf7cbce81846aeb;p=dealii.git Detect gcc3.4.6 git-svn-id: https://svn.dealii.org/trunk@11936 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 2d43a79d31..0dc0ebb82b 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 diff --git a/deal.II/configure b/deal.II/configure index 805cb961ab..182b68012c 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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