Fixed HDF5 configuration setup for Windows where libz is named zlib,

and no math lib should be in LIBS.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2251 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 54 insertions, 41 deletions

diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh
index f7ba1365..b285ae8b 100755
--- a/lib/make/extras/HDF5/setup.sh
+++ b/lib/make/extras/HDF5/setup.sh
@@ -1,27 +1,27 @@
 #! /bin/sh
 # /*@@
-#   @file      setup.sh
-#   @date      Fri Jul 30 1999
-#   @author    Thomas Radke
-#   @desc 
-#              Setup HDF5
-#   @enddesc 
+#  @file   setup.sh
+#  @date   Fri Jul 30 1999
+#  @author Thomas Radke
+#  @desc
+#          Setup HDF5
+#  @enddesc
 # @@*/
-    
-if test -n "$HDF5" ; then
-	
+
+if [ -n "$HDF5" ] ; then
+
 echo "Configuring with HDF5. Blocks with #ifdef HDF5 will be activated"
 
 # Work out which variation of HDF5 lib
-    
-if test -z "$HDF5_DIR" ; then
-   echo "HDF5 selected but no HDF5_DIR set... Checking some places"
-   CCTK_Search HDF5_DIR "/usr /usr/local /usr/local/hdf5 /usr/local/packages/hdf5 /usr/local/apps/hdf5 /usr/local/hdf5/serial c:/packages/hdf5" include/hdf5.h
-   if test -z "$HDF5_DIR" ; then
-       echo "Unable to locate the HDF5 directory - please set HDF5_DIR"
-       exit 2
-   fi
-   echo "Found an HDF5 package in $HDF5_DIR"
+
+if [ -z "$HDF5_DIR" ] ; then
+  echo "HDF5 selected but no HDF5_DIR set... Checking some places"
+  CCTK_Search HDF5_DIR "/usr /usr/local /usr/local/hdf5 /usr/local/packages/hdf5 /usr/local/apps/hdf5 /usr/local/hdf5/serial c:/packages/hdf5" include/hdf5.h
+  if [ -z "$HDF5_DIR" ] ; then
+     echo "Unable to locate the HDF5 directory - please set HDF5_DIR"
+     exit 2
+  fi
+  echo "Found an HDF5 package in $HDF5_DIR"
 fi
 
 
@@ -31,23 +31,23 @@ grep -qe '#define HAVE_PARALLEL 1' ${HDF5_DIR}/include/H5config.h 2> /dev/null
 test_phdf5=$?
 
 if [ -n "$MPI" ] ; then
-   if [ $test_phdf5 -eq 0 ] ; then
-      echo "Found parallel HDF5 library, so Cactus will make use of PHDF5 support."
-   else
-      echo "Found serial HDF5 library, so Cactus can't make use of PHDF5 support."
-   fi
+  if [ $test_phdf5 -eq 0 ] ; then
+    echo "Found parallel HDF5 library, so Cactus will make use of PHDF5 support."
+  else
+    echo "Found serial HDF5 library, so Cactus can't make use of PHDF5 support."
+  fi
 else
-   if [ $test_phdf5 -eq 0 ] ; then
-      echo "Found parallel HDF5 library, but Cactus wasn't configured with MPI."
-      echo "Please set HDF5_DIR to point to a serial HDF5 package, or configure Cactus with MPI."
-      exit 2
-   fi
+  if [ $test_phdf5 -eq 0 ] ; then
+    echo "Found parallel HDF5 library, but Cactus wasn't configured with MPI."
+    echo "Please set HDF5_DIR to point to a serial HDF5 package, or configure Cactus with MPI."
+    exit 2
+  fi
 fi
 
 
 # Set the HDF5 libs, libdirs and includedirs
 
-HDF5_LIBS=hdf5 
+HDF5_LIBS=hdf5
 HDF5_LIB_DIRS="$HDF5_DIR/lib"
 HDF5_INC_DIRS="$HDF5_DIR/include"
 
@@ -69,21 +69,34 @@ 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" -a ! -r /usr/lib/libz.a ; then
-      echo "HDF5 library was compiled with libz, searching for 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
-      fi
-      echo "Found library libz.a in $LIBZ_DIR"
-   fi
-   HDF5_LIBS="$HDF5_LIBS z"
-   HDF5_LIB_DIRS="$HDF5_LIB_DIRS $LIBZ_DIR"
+  $PERL -we 'exit (`uname` =~ /^CYGWIN/)'
+  is_windows=$?
+  if [ $is_windows -eq 0 ] ; then
+    libz='libz.a'
+  else
+    libz='zlib.lib'
+  fi
+  if [ -z "$LIBZ_DIR" -a ! -r /usr/lib/$libz ] ; then
+    echo "HDF5 library was compiled with compression library, searching for $libz ..."
+    CCTK_Search LIBZ_DIR "/usr/local/lib c:/packages/libz/lib c:/packages/hdf5/lib" $libz
+    if [ -z "$LIBZ_DIR" ] ; then
+       echo "Unable to locate the library $libz - please set LIBZ_DIR"
+       exit 2
+    fi
+    echo "Found library $libz in $LIBZ_DIR"
+  fi
+  if [ $is_windows -eq 0 ] ; then
+    HDF5_LIBS="$HDF5_LIBS z"
+  else
+    HDF5_LIBS="$HDF5_LIBS zlib"
+  fi
+  HDF5_LIB_DIRS="$HDF5_LIB_DIRS $LIBZ_DIR"
 fi
 
 # Finally, add the math lib which might not be linked against by default
-HDF5_LIBS="$HDF5_LIBS m"
+if [ $is_windows -eq 0 ] ; then
+  HDF5_LIBS="$HDF5_LIBS m"
+fi
 
 # Write the data out to the header and make files.