From 0df3500b6ee15c863a8112f77aacf81a2280e62b Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee>
Date: Sat, 26 Jun 2010 13:16:58 +0000
Subject: Patch from David Radice

At the moment the compilation of EinsteinToolkit with LORENE fails if
LORENE is configured to use FFTW as LORENE_LIBS does not contain fftw3.

The attached patch solves the problem by allowing the user to specify
additional directories and libraries in the optionlist file.


git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@19 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
---
 LORENE.sh         | 6 +++---
 configuration.ccl | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LORENE.sh b/LORENE.sh
index 3d534c8..3145d12 100644
--- a/LORENE.sh
+++ b/LORENE.sh
@@ -60,7 +60,7 @@ if [ -z "${LORENE_DIR}" ]; then
         MAKE=$(gmake --help > /dev/null 2>&1 && echo gmake || echo make)
         # Should we use gpatch or patch?
         if [ -z "$PATCH" ]; then
-          PATCH=$(gpatch -v > /dev/null 2>&1 && echo gpatch || echo patch)
+            PATCH=$(gpatch -v > /dev/null 2>&1 && echo gpatch || echo patch)
         fi
         # Should we use gtar or tar?
         TAR=$(gtar --help > /dev/null 2>&1 && echo gtar || echo tar)
@@ -156,8 +156,8 @@ fi
 
 # Set options
 LORENE_INC_DIRS="${LORENE_DIR}/Export/C++/Include ${LORENE_DIR}/C++/Include"
-LORENE_LIB_DIRS="${LORENE_DIR}/Lib"
-LORENE_LIBS='lorene_export lorene lorenef77'
+LORENE_LIB_DIRS="${LORENE_DIR}/Lib ${LORENE_EXTRA_LIB_DIRS}"
+LORENE_LIBS="lorene_export lorene lorenef77 ${LORENE_EXTRA_LIBS}"
 
 # Pass options to Cactus
 echo "BEGIN MAKE_DEFINITION"
diff --git a/configuration.ccl b/configuration.ccl
index b62db6d..50c9e9b 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,6 +4,7 @@ PROVIDES LORENE
 {
   SCRIPT LORENE.sh
   LANG bash
+  OPTIONS LORENE_DIR LORENE_EXTRA_LIB_DIRS LORENE_EXTRA_LIBS
 }
 
 REQUIRES LAPACK BLAS GSL
-- 
cgit v1.2.3