Bring over patch 21561.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21562 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/configure b/deal.II/configure
index 6c287fd267538ec854f88457c62196a09e4d7d07..695fbcfccca8ef8c95d13b42bc310a6fe4d4f1ff 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -12027,14 +12027,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 9dcbfa9f547f9d4f70dac8d0e8413966a04efb00..7640fa3166c0d0117036fd0cb0cac390d7fe114a 100644 (file)
--- 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 67c82ec151fb37da61c1ae5001f85fdf83a62539..9dcddefa92b59e360acb3fe68582b04ada7b7aef 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -38,7 +38,14 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
-  <li>None so far.
+  <li>
+  <p>Fixed: On all non-linux platforms, if static libraries were selected
+  and <code>./configure</code> was instructed to use Trilinos (which also
+  was compiled with static libraries), a failure would occur. This should
+  now be fixed.
+  <br>
+  (WB 2010/07/23)
+  </p>
 </ol>
 
 
@@ -59,6 +66,7 @@ inconvenience this causes.
 </ol>
 
 
+
 <a name="deal.II"></a>
 <h3>deal.II</h3>