diff options
-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 |