diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-05-26 14:59:51 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-05-26 14:59:51 +0000 |
| commit | 566397275f83508745b14d0cee12e628b7249129 (patch) | |
| tree | 240eaea05476d87ea8aabec29d5556a3b64fff64 | |
| parent | 5f60d86fa0d794a4ef35533968dc1627e26ed2d3 (diff) | |
Search for libsz.a also in the given HDF5 installation.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3751 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rwxr-xr-x | lib/make/extras/HDF5/setup.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh index 623018a1..5a2d86d2 100755 --- a/lib/make/extras/HDF5/setup.sh +++ b/lib/make/extras/HDF5/setup.sh @@ -95,7 +95,7 @@ if [ $test_szlib -eq 0 ]; then if [ -z "$LIBSZ_DIR" -a ! -r /usr/lib/$libsz ]; then echo " HDF5 library was built with external szlib I/O filter, searching for library $libsz ..." - CCTK_Search LIBSZ_DIR '/usr/local/lib c:/packages/libsz/lib c:/packages/hdf5/lib' $libsz + CCTK_Search LIBSZ_DIR "$HDF5_LIB_DIRS /usr/local/lib c:/packages/libsz/lib c:/packages/hdf5/lib" $libsz if [ -z "$LIBSZ_DIR" ]; then echo " Unable to locate the library $libsz - please set LIBSZ_DIR" exit 2 @@ -107,7 +107,9 @@ if [ $test_szlib -eq 0 ]; then else HDF5_LIBS="$HDF5_LIBS szlib" fi - HDF5_LIB_DIRS="$HDF5_LIB_DIRS $LIBSZ_DIR" + if [ ! -z "$LIBSZ_DIR" -a "$LIBSZ_DIR" != "$HDF5_LIB_DIRS" ]; then + HDF5_LIB_DIRS="$HDF5_LIB_DIRS $LIBSZ_DIR" + fi fi |