deal.ii (6.3.1-1) metis.patch

Summary

 aclocal.m4                    |    3 ++-
 common/Make.global_options.in |    4 +++-
 configure.in                  |    1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

    
download this patch

Patch contents

Debian-compatible metis usage

Index: deal.ii-6.3.1/aclocal.m4
===================================================================
--- deal.ii-6.3.1.orig/aclocal.m4	2010-07-22 13:04:49.000000000 +0200
+++ deal.ii-6.3.1/aclocal.m4	2010-07-22 13:05:02.000000000 +0200
@@ -6372,7 +6372,8 @@
               [AS_HELP_STRING([--with-metis-include=/path/to/metis],
               [Specify the path to the METIS headers file; use this if you want to override the METIS_INCLUDE_DIR environment variable.])],
      [
-        AC_MSG_ERROR([The --with-metis-include directive is no longer supported])
+        DEAL_II_METIS_DIR="$withval"
+	AC_MSG_RESULT($DEAL_II_METIS_INCDIR)
      ])
 
   AC_ARG_WITH(metis-libs,
Index: deal.ii-6.3.1/common/Make.global_options.in
===================================================================
--- deal.ii-6.3.1.orig/common/Make.global_options.in	2010-07-22 13:04:54.000000000 +0200
+++ deal.ii-6.3.1/common/Make.global_options.in	2010-07-22 13:05:02.000000000 +0200
@@ -170,8 +170,10 @@
 endif
 
 # same for metis, except that there is only one library in that case
+include-path-metis = $(DEAL_II_METIS_INCDIR)
 ifeq ($(USE_CONTRIB_METIS),yes)
-  lib-contrib-metis = $(DEAL_II_METIS_LIBDIR)/libmetis.a
+  INCLUDE += -I$(include-path-metis)
+  lib-contrib-metis = $(DEAL_II_METIS_LIBDIR)/libmetis.so
 endif
 
 # List all trilinos libraries that we want to link with. These must be sorted
Index: deal.ii-6.3.1/configure.in
===================================================================
--- deal.ii-6.3.1.orig/configure.in	2010-07-22 13:04:49.000000000 +0200
+++ deal.ii-6.3.1/configure.in	2010-07-22 13:05:02.000000000 +0200
@@ -550,6 +550,7 @@
 DEAL_II_CONFIGURE_METIS
 AC_SUBST(USE_CONTRIB_METIS)
 AC_SUBST(DEAL_II_METIS_LIBDIR)
+AC_SUBST(DEAL_II_METIS_INCDIR)
 
 dnl Check for UMFPack
 DEAL_II_WITH_UMFPACK