From d223fd0b37da79c558fb40ef7c9de689197e08bf Mon Sep 17 00:00:00 2001 From: rschulz Date: Tue, 20 Dec 2005 19:46:51 +0000 Subject: [PATCH] changed cygwin "-Xlinker --allow-multiple-definition" as it was added to the wrong variable git-svn-id: https://svn.dealii.org/trunk@11897 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 6 ++++-- deal.II/configure | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b5675625ab..2d43a79d31 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -405,8 +405,10 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl but of course this might lead to strange program behaviour if dnl you accidentally defined one symbol multiple times... dnl (added 2005/07/13, Ralf B. Schulz) - CXXFLAGSPIC="-Xlinker --allow-multiple-definition" - LDFLAGSPIC="--allow-multiple-definition" + dnl (modified 2005/12/20, Ralf B. Schulz) + CXXFLAGSPIC= + LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition" + SHLIBFLAGS="$SHLIBFLAGS -Xlinker --allow-multiple-definition" ;; *) diff --git a/deal.II/configure b/deal.II/configure index 5ef54b72e8..805cb961ab 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.216 . +# From configure.in Revision: 1.217 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for deal.II 5.3.pre. # @@ -3183,8 +3183,9 @@ echo "${ECHO_T}Unrecognized C++ compiler -- Try to go ahead and get help from de ;; *cygwin* ) - CXXFLAGSPIC="-Xlinker --allow-multiple-definition" - LDFLAGSPIC="--allow-multiple-definition" + CXXFLAGSPIC= + LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition" + SHLIBFLAGS="$SHLIBFLAGS -Xlinker --allow-multiple-definition" ;; *) @@ -10739,9 +10740,10 @@ 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. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + # 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' done LIBOBJS=$ac_libobjs -- 2.39.5