From e1fa731a6e8ad0b615720a22a54fb812e34430ff Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 23 Jul 2010 14:28:03 +0000 Subject: [PATCH] Do set static_lib_suffix correctly for non-linux platforms. git-svn-id: https://svn.dealii.org/trunk@21561 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 3 +++ deal.II/configure.in | 3 +++ deal.II/doc/news/changes.h | 13 +++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index f8c8591cc2..4529e1b87b 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -12032,14 +12032,17 @@ case "$target" in *-aix4* | alpha*-linux* | alpha*-osf45* | hppa64-unknown-linux-gnu ) { $as_echo "$as_me:$LINENO: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 $as_echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} + static_lib_suffix=".a" enableshared=no ;; *cygwin ) shared_lib_suffix=".dll" + static_lib_suffix=".a" cygwin_shared_lib="yes" ;; *-apple-darwin* ) shared_lib_suffix=".dylib" + static_lib_suffix=".a" darwin_shared_lib="yes" ;; * ) diff --git a/deal.II/configure.in b/deal.II/configure.in index c67a64bb95..b23589e175 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -275,14 +275,17 @@ dnl on Mac OS X it is .dylib. case "$target" in *-aix4* | alpha*-linux* | alpha*-osf[45]* | hppa64-unknown-linux-gnu ) AC_MSG_WARN(Shared libraries not supported on $target. Using static libs instead) + static_lib_suffix=".a" enableshared=no ;; *cygwin ) shared_lib_suffix=".dll" + static_lib_suffix=".a" cygwin_shared_lib="yes" ;; *-apple-darwin* ) shared_lib_suffix=".dylib" + static_lib_suffix=".a" darwin_shared_lib="yes" ;; * ) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index a8d949a1ff..8d59c25c93 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -38,9 +38,18 @@ inconvenience this causes.

General

    +
  1. +

    Fixed: On all non-linux platforms, if static libraries were selected + and ./configure was instructed to use Trilinos (which also + was compiled with static libraries), a failure would occur. This should + now be fixed. +
    + (WB 2010/07/23) +

    +
  2. Fixed: The step-33 tutorial program can not be built with GCC versions - 4.5.x. There are in fact two problems, on that pertains to uses of + 4.5.x. There are in fact two problems, one that pertains to uses of std::make_pair that don't work any more with the upcoming C++ 1x standard that GCC 4.5.x already follows, and some in which the Trilinos package Sacado is incompatible with GCC 4.5.x, at least up to @@ -166,7 +175,7 @@ inconvenience this causes.

- + -- 2.39.5