From d81f0b2017b1340a7445a09967fd253da72a6a90 Mon Sep 17 00:00:00 2001
From: bmundim <bmundim@fb53df36-e548-4a1e-8150-ab98cbd5e786>
Date: Sat, 23 Jul 2011 04:56:10 +0000
Subject: Introduce HDF5_INSTALL_DIR configuration option.

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@40 fb53df36-e548-4a1e-8150-ab98cbd5e786
---
 HDF5.sh           | 12 +++++++++++-
 configuration.ccl |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/HDF5.sh b/HDF5.sh
index 8c31ddc..b75b82c 100644
--- a/HDF5.sh
+++ b/HDF5.sh
@@ -89,7 +89,17 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then
     NAME=hdf5-1.8.6
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
-    INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    if [ -z "${HDF5_INSTALL_DIR}" ]; then
+        echo "BEGIN MESSAGE"
+        echo "HDF5 install directory, HDF5_INSTALL_DIR, not set. Installing in the default configuration location. "
+        echo "END MESSAGE"
+     INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    else
+        echo "BEGIN MESSAGE"
+        echo "HDF5 install directory, HDF5_INSTALL_DIR, selected. Installing HDF5 at ${HDF5_INSTALL_DIR} "
+        echo "END MESSAGE"
+     INSTALL_DIR=${HDF5_INSTALL_DIR}
+    fi
     DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
     HDF5_DIR=${INSTALL_DIR}
     
diff --git a/configuration.ccl b/configuration.ccl
index 9660de8..8200b26 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,7 +4,7 @@ PROVIDES HDF5
 {
   SCRIPT HDF5.sh
   LANG bash
-  OPTIONS HDF5 HDF5_DIR HDF5_ENABLE_CXX HDF5_ENABLE_FORTRAN ZLIB_DIR LIBSZ_DIR LIBZ_DIR
+  OPTIONS HDF5 HDF5_DIR HDF5_INSTALL_DIR HDF5_ENABLE_CXX HDF5_ENABLE_FORTRAN ZLIB_DIR LIBSZ_DIR LIBZ_DIR
 }
 
 REQUIRES HDF5
-- 
cgit v1.2.3