From d100473577d3101b15b5913fa43387a1d1ba9a8b Mon Sep 17 00:00:00 2001
From: tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Tue, 14 Mar 2000 17:26:06 +0000
Subject: Checks for zlib in old 1.0.x versions of HDF5. Fixes (second part of)
 Erik's BR Compiler/274.

Thomas


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1471 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/make/extras/HDF5/setup.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/make')

diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh
index 42da18af..1a648b1d 100755
--- a/lib/make/extras/HDF5/setup.sh
+++ b/lib/make/extras/HDF5/setup.sh
@@ -57,7 +57,11 @@ HDF5_INC_DIRS="$HDF5_DIR/include"
 grep -qe '#define HAVE_COMPRESS2 1' ${HDF5_DIR}/include/H5config.h 2> /dev/null
 test_compress2=$?
 
-if [ $test_compress2 -eq 0 ] ; then
+# this is for old 1.0.x versions of HDF5 where they used different defines for zlib
+grep -qe '#define HAVE_LIBZ 1' ${HDF5_DIR}/include/H5config.h 2> /dev/null
+test_zlib=$?
+
+if [ $test_compress2 -eq 0 -o $test_zlib -eq 0 ] ; then
    if test -z "$LIBZ_DIR" ; then
       echo "HDF5 library was compiled with libz, searching for libz.a ..."
       CCTK_Search LIBZ_DIR "/usr/lib /usr/local/lib c:/packages/libz" libz.a
-- 
cgit v1.2.3