From: bangerth Date: Mon, 17 Oct 2011 19:44:56 +0000 (+0000) Subject: Fix configuring with Trilinos on Debian. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=960336f564cd1fa20ed4e3e8d2e6ed502eae03e9;p=dealii-svn.git Fix configuring with Trilinos on Debian. git-svn-id: https://svn.dealii.org/trunk@24617 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 93f8377885..f0d766cfcc 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -6477,7 +6477,9 @@ dnl ------------------------------------------------------------ AC_DEFUN(DEAL_II_CHECK_TRILINOS_SHARED_STATIC, dnl [ dnl Check using the epetra library since that should always be there - + dnl The problem is that on Debian, the library isn't called + dnl libepetra.so, but instead libtrilinos_epetra.so, so + dnl record this prefix in a variable of its own AC_MSG_CHECKING(whether Trilinos uses shared libraries) if test -f $DEAL_II_TRILINOS_LIBDIR/libepetra${shared_lib_suffix} ; then AC_MSG_RESULT(yes) @@ -6553,11 +6555,20 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_LIBS, dnl dnl This is the location for 10.8 and following DEAL_II_TRILINOS_LIBS="`grep Trilinos_LIBRARIES $DEAL_II_TRILINOS_LIBDIR/cmake/Trilinos/TrilinosConfig.cmake \ | perl -pi -e 's/.*\"(.*)\".*/\1/g; s/;/ /g;'`" + + dnl Above, we may have set DEAL_II_TRILINOS_LIBPREFIX="trilinos_" to deal + dnl with alternate naming conventions on Debian. However, if + dnl we can get the list of libraries from Trilinos directly we + dnl don't really need to do this any more + DEAL_II_TRILINOS_LIBPREFIX="" else if test -f $DEAL_II_TRILINOS_INCDIR/TrilinosConfig.cmake ; then dnl The location prior to 10.8 DEAL_II_TRILINOS_LIBS="`grep Trilinos_LIBRARIES $DEAL_II_TRILINOS_INCDIR/TrilinosConfig.cmake \ | perl -pi -e 's/.*\"(.*)\".*/\1/g; s/;/ /g;'`" + + dnl Same as above + DEAL_II_TRILINOS_LIBPREFIX="" else dnl Fall back to the fixed list. This should only be necessary dnl for Trilinos versions before 10.4. If, for a later version, diff --git a/deal.II/configure b/deal.II/configure index 622892f8cb..967157dbf8 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -10834,8 +10834,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="${OLD_CXXFLAGS}" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Trilinos uses shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Trilinos uses shared libraries" >&5 $as_echo_n "checking whether Trilinos uses shared libraries... " >&6; } if test -f $DEAL_II_TRILINOS_LIBDIR/libepetra${shared_lib_suffix} ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -10894,10 +10893,14 @@ $as_echo_n "checking for the set of Trilinos libraries... " >&6; } if test -f $DEAL_II_TRILINOS_LIBDIR/cmake/Trilinos/TrilinosConfig.cmake ; then DEAL_II_TRILINOS_LIBS="`grep Trilinos_LIBRARIES $DEAL_II_TRILINOS_LIBDIR/cmake/Trilinos/TrilinosConfig.cmake \ | perl -pi -e 's/.*\"(.*)\".*/\1/g; s/;/ /g;'`" + + DEAL_II_TRILINOS_LIBPREFIX="" else if test -f $DEAL_II_TRILINOS_INCDIR/TrilinosConfig.cmake ; then DEAL_II_TRILINOS_LIBS="`grep Trilinos_LIBRARIES $DEAL_II_TRILINOS_INCDIR/TrilinosConfig.cmake \ | perl -pi -e 's/.*\"(.*)\".*/\1/g; s/;/ /g;'`" + + DEAL_II_TRILINOS_LIBPREFIX="" else if test $DEAL_II_TRILINOS_VERSION_MAJOR = 10 -a \ $DEAL_II_TRILINOS_VERSION_MINOR -lt 4 ; then diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index f861da34a1..2f66473725 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -34,11 +34,7 @@ inconvenience this causes.

General

    -
  1. New: parallel::distributed::Triangulation::save()/load() to store -the refinement information to disk. Also supports saving solution vectors -using the SolutionTransfer class. -
    -(Timo Heister, 2011/10/12) +
@@ -48,16 +44,29 @@ using the SolutionTransfer class.

Specific improvements

    +
  1. Fixed: Using Trilinos versions 10.4 and later on Debian failed to +configure due to a different naming scheme of Trilinos libraries on +Debian. This is now fixed. +
    +(Wolfgang Bangerth, 2011/10/17) +
  2. Changed: The TableHandler class has been changed significantly internally. It could previously store arbitrary values (though in practice, only int, unsigned int, double and std::string were implemented. The class is now restricted to this particular -set of types +set of types.
    (Wolfgang Bangerth, 2011/10/17)
  3. Fixed: searching in the doxygen documentation.
    (Timo Heister, 2011/10/13) + +
  4. New: parallel::distributed::Triangulation::save()/load() to store +the refinement information to disk. Also supports saving solution vectors +using the SolutionTransfer class. +
    +(Timo Heister, 2011/10/12) +
  5. Fixed: The DataOut_DoFData::merge_patches did not compile with newer compilers. This is now fixed.