From da60cc630a5301640759d499799eebc6398f7b2f Mon Sep 17 00:00:00 2001 From: tradke Date: Mon, 27 Mar 2000 13:49:29 +0000 Subject: Search explicitely in /usr/lib/ for libz.a, and don't add it to the LIBDIRS if found. This prevents picking up the wrong (32bit) library on 64bit SGIs. git-svn-id: http://svn.cactuscode.org/flesh/trunk@1495 17b73243-c579-4c4c-a9d2-2d5706c11dac --- lib/make/extras/HDF5/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/make') diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh index 1a648b1d..06f1d0ac 100755 --- a/lib/make/extras/HDF5/setup.sh +++ b/lib/make/extras/HDF5/setup.sh @@ -62,9 +62,9 @@ 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 + if test -z "$LIBZ_DIR" -a test -r /usr/lib/libz.a ; 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 + CCTK_Search LIBZ_DIR "/usr/local/lib c:/packages/libz" libz.a if test -z "$LIBZ_DIR" ; then echo "Unable to locate the library libz.a - please set LIBZ_DIR" exit 2 -- cgit v1.2.3