aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnetter <schnetter@7842ec3a-9562-4be5-9c5b-06ba18f2b668>2009-09-24 18:55:28 +0000
committerschnetter <schnetter@7842ec3a-9562-4be5-9c5b-06ba18f2b668>2009-09-24 18:55:28 +0000
commit1c713018dad26a979f5e1f884e463ab2813867ae (patch)
tree073c033401c3fbec58de2a3c503f58f5d649fb88
parent8e32f1123159ee4de4fe18a14ff00b80940e6552 (diff)
Require capability HDF5 via configuration.ccl instead of checking its
presence in the makefile git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5Util/trunk@146 7842ec3a-9562-4be5-9c5b-06ba18f2b668
-rw-r--r--configuration.ccl2
-rw-r--r--src/make.configuration.defn5
2 files changed, 1 insertions, 6 deletions
diff --git a/configuration.ccl b/configuration.ccl
index 5644426..0df647f 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -7,4 +7,4 @@ PROVIDES IOHDF5Util
LANG
}
-REQUIRES PUGH IOUtil
+REQUIRES PUGH IOUtil HDF5
diff --git a/src/make.configuration.defn b/src/make.configuration.defn
index 8848131..0028cfb 100644
--- a/src/make.configuration.defn
+++ b/src/make.configuration.defn
@@ -1,7 +1,2 @@
# make.configuration.defn for IOHDF5Util
# $Header$
-
-# Ensure that the HDF5 library is available
-ifeq ($(strip $(HAVE_HDF5)),)
- $(error 'IOHDF5Util requires an external HDF5 installation. Please reconfigure with HDF5=yes or remove IOHDF5Util from the ThornList !')
-endif