diff options
| author | schnetter <schnetter@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2010-03-28 04:10:35 +0000 |
|---|---|---|
| committer | schnetter <schnetter@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2010-03-28 04:10:35 +0000 |
| commit | 4890561c57eab0cb12b4975289d9c77423afd32a (patch) | |
| tree | 1a302f0cdbef613173455e55cf22329ce1ff0844 | |
| parent | 32d49b6025678feea6f1b54d4d1fa8657559c023 (diff) | |
Honour configuration variables LIBSZ_DIR and LIBZ_DIR
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@10 fb53df36-e548-4a1e-8150-ab98cbd5e786
| -rw-r--r-- | HDF5.sh | 2 | ||||
| -rw-r--r-- | configuration.ccl | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -146,6 +146,7 @@ else test_szlib=1 fi if [ $test_szlib -eq 0 ]; then + HDF5_LIB_DIRS="$HDF5_LIB_DIRS $LIBSZ_DIR" if [ $is_windows -eq 0 ]; then HDF5_LIBS="$HDF5_LIBS sz" else @@ -160,6 +161,7 @@ else test_zlib=1 fi if [ $test_zlib -eq 0 ]; then + HDF5_LIB_DIRS="$HDF5_LIB_DIRS $LIBZ_DIR" if [ $is_windows -eq 0 ]; then HDF5_LIBS="$HDF5_LIBS z" else diff --git a/configuration.ccl b/configuration.ccl index de8b1fd..25fd2a7 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,5 +4,5 @@ PROVIDES HDF5 { SCRIPT HDF5.sh LANG bash - OPTIONS HDF5_DIR + OPTIONS HDF5_DIR LIBSZ_DIR LIBZ_DIR } |