The old way of specifying the location of external libraries, from

Cactus/lib/make/extras, for example setting HDF5 = yes, is not
compatible with the new mechanism where you must simply include the
appropriate thorn from ExternalThorns. Using both can be confusing.

This patch modifies the thorn HDF5 in ExternalLibraries to check if
the old mechanism has been selected, and to abort with an explanatory
error message telling the user not to set, e.g. HDF5 = yes, if they
are using ExternalLibraries/HDF5.


git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@36 fb53df36-e548-4a1e-8150-ab98cbd5e786

2 files changed, 14 insertions, 1 deletions

diff --git a/HDF5.sh b/HDF5.sh
index b37171c..721cadf 100644
--- a/HDF5.sh
+++ b/HDF5.sh
@@ -11,6 +11,19 @@ set -e                          # Abort on errors
 
 
 ################################################################################
+# Check for old mechanism
+################################################################################
+
+if [ -n "${HDF5}" ]; then
+    echo 'BEGIN ERROR'
+    echo "Setting the option \"HDF5\" is incompatible with the HDF5 thorn. Please remove the option HDF5 = ${HDF5}."
+    echo 'END ERROR'
+    exit 1
+fi
+
+
+
+################################################################################
 # Search
 ################################################################################
 
diff --git a/configuration.ccl b/configuration.ccl
index 6a960d4..9c1eb0e 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,7 +4,7 @@ PROVIDES HDF5
 {
   SCRIPT HDF5.sh
   LANG bash
-  OPTIONS HDF5_DIR ZLIB_DIR LIBSZ_DIR LIBZ_DIR
+  OPTIONS HDF5 HDF5_DIR ZLIB_DIR LIBSZ_DIR LIBZ_DIR
 }
 
 REQUIRES HDF5