diff options
| author | eschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2011-01-26 20:14:07 +0000 |
|---|---|---|
| committer | eschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2011-01-26 20:14:07 +0000 |
| commit | 843647b42b132d851f16c7d2da798b4d7d6ce24a (patch) | |
| tree | 8ce35349837ff24aa7ba480a7abc06b226df5098 | |
| parent | 398e7dcadffbab067528106d31dd130deea06c9d (diff) | |
Require zlib.
Unset RPATH.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@28 fb53df36-e548-4a1e-8150-ab98cbd5e786
| -rw-r--r-- | HDF5.sh | 3 | ||||
| -rw-r--r-- | configuration.ccl | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -99,6 +99,7 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then fi export LDFLAGS unset LIBS + unset RPATH if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then export OBJECT_MODE=64 fi @@ -115,7 +116,7 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then echo "HDF5: Configuring..." cd ${NAME} - ./configure --prefix=${HDF5_DIR} --enable-cxx $(if [ -n "${FC}" ]; then echo '' '--enable-fortran'; fi) + ./configure --prefix=${HDF5_DIR} --with-zlib=${ZLIB_DIR} --enable-cxx $(if [ -n "${FC}" ]; then echo '' '--enable-fortran'; fi) echo "HDF5: Building..." ${MAKE} diff --git a/configuration.ccl b/configuration.ccl index 25fd2a7..9e1b8b2 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,5 +4,7 @@ PROVIDES HDF5 { SCRIPT HDF5.sh LANG bash - OPTIONS HDF5_DIR LIBSZ_DIR LIBZ_DIR + OPTIONS HDF5_DIR ZLIB_DIR LIBSZ_DIR LIBZ_DIR } + +REQUIRES zlib |