gistfile1.txt

Index: configuration.ccl
===================================================================
--- configuration.ccl	(revision 128)
+++ configuration.ccl	(working copy)
@@ -4,7 +4,7 @@
 {
   SCRIPT src/detect.sh
   LANG bash
-  OPTIONS HDF5 HDF5_DIR HDF5_INSTALL_DIR HDF5_ENABLE_CXX HDF5_ENABLE_FORTRAN ZLIB_DIR LIBSZ_DIR LIBZ_DIR
+  OPTIONS HDF5 HDF5_DIR HDF5_INC_DIRS HDF5_LIB_DIRS HDF5_LIBS HDF5_INSTALL_DIR HDF5_ENABLE_CXX HDF5_ENABLE_FORTRAN ZLIB_DIR LIBSZ_DIR LIBZ_DIR
 }
 
 REQUIRES HDF5
Index: src/detect.sh
===================================================================
--- src/detect.sh	(revision 128)
+++ src/detect.sh	(working copy)
@@ -127,9 +127,9 @@
     fi
     HDF5_DIR=${INSTALL_DIR}
     # Fortran modules may be located in the lib directory
-    HDF5_INC_DIRS="${HDF5_DIR}/include ${HDF5_DIR}/lib"
-    HDF5_LIB_DIRS="${HDF5_DIR}/lib"
-    HDF5_LIBS="${HDF5_CXX_LIBS} ${HDF5_FORTRAN_LIBS} ${HDF5_C_LIBS}"
+    : ${HDF5_INC_DIRS:="${HDF5_DIR}/include ${HDF5_DIR}/lib"}
+    : ${HDF5_LIB_DIRS:="${HDF5_DIR}/lib"}
+    : ${HDF5_LIBS:="${HDF5_CXX_LIBS} ${HDF5_FORTRAN_LIBS} ${HDF5_C_LIBS}"}
 else
     mkdir ${SCRATCH_BUILD}/done 2> /dev/null || true
     DONE_FILE=${SCRATCH_BUILD}/done/${THORN}