From ae52de042614783630268ff770190676ff245525 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Thu, 4 Oct 2012 11:37:28 +0200
Subject: [PATCH] Added test for SuperLU and adapted the Makefile.am to support
 it

---
 Makefile.am           | 5 +++--
 examples/Makefile.am  | 6 ++++--
 m4/opm_core.m4        | 1 +
 tests/Makefile.am     | 2 +-
 tutorials/Makefile.am | 6 ++++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 845c5fa9..7ed2db90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,8 @@ lib_LTLIBRARIES = lib/libopmcore.la
 # Build-time flags needed to build libopmcore.la
 
 AM_CPPFLAGS =					\
-$(OPM_BOOST_CPPFLAGS)
+$(OPM_BOOST_CPPFLAGS)                           \
+${SUPERLU_CPPFLAGS}
 
 # ----------------------------------------------------------------------
 # Link-time flags needed both to successfully link the library and to
@@ -24,7 +25,7 @@ $(BOOST_FILESYSTEM_LIB)				\
 $(BOOST_SYSTEM_LIB)				\
 $(BOOST_DATE_TIME_LIB)				\
 $(BOOST_UNIT_TEST_FRAMEWORK_LIB)		\
-$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS)
+$(LAPACK_LIBS) ${SUPERLU_LIBS} $(BLAS_LIBS) $(LIBS)
 
 # ----------------------------------------------------------------------
 # Library constituents.  SOURCES followed by HEADERS.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b01f7674..25ced77b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,13 +1,15 @@
 # Build-time flags needed to form example programs
 AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS)
+$(OPM_BOOST_CPPFLAGS)                           \
+${SUPERLU_CPPFLAGS}
 
 # All targets link to the library
 LDADD =						\
 $(top_builddir)/lib/libopmcore.la		\
 $(BOOST_FILESYSTEM_LIB)				\
-$(BOOST_SYSTEM_LIB)
+$(BOOST_SYSTEM_LIB)                             \
+${SUPERLU_LIBS} $(BLAS_LIBS) $(LIBS)
 
 # ----------------------------------------------------------------------
 # Declare products (i.e., the example programs).
diff --git a/m4/opm_core.m4 b/m4/opm_core.m4
index efb75c13..326ccd58 100644
--- a/m4/opm_core.m4
+++ b/m4/opm_core.m4
@@ -19,6 +19,7 @@ AX_BOOST_FILESYSTEM
 AX_BOOST_UNIT_TEST_FRAMEWORK
 
 AX_DUNE_ISTL
+DUNE_PATH_SUPERLU
 OPM_AGMG
 
 # Checks for header files.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 43812479..223b2153 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS)
+$(OPM_BOOST_CPPFLAGS) ${SUPERLU_CPPFLAGS}
 
 AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
 
diff --git a/tutorials/Makefile.am b/tutorials/Makefile.am
index a5e42569..64e46dd2 100644
--- a/tutorials/Makefile.am
+++ b/tutorials/Makefile.am
@@ -1,8 +1,10 @@
 AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS)
+$(OPM_BOOST_CPPFLAGS)                           \
+${SUPERLU_CPPFLAGS}
 
-AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
+AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)               \
+${SUPERLU_LIBS} $(BLAS_LIBS) $(LIBS)
 
 LDADD =	$(top_builddir)/lib/libopmcore.la