diff --git a/script/install_HDF5.sh b/script/install_HDF5.sh index ffe608134b6bb901dba49e3ab571140191510663..7f81868dd0f3eb0aa74b619e4377f4fbee30436e 100755 --- a/script/install_HDF5.sh +++ b/script/install_HDF5.sh @@ -11,30 +11,30 @@ if [ -d "$1/HDF5" -a -f "$1/HDF5/include/hdf5.h" ]; then exit 0 fi -#if [ ! -d "$1/ZLIB" -a x"$platform" != x"cygwin" ]; then -# rm zlib-1.2.12.tar.gz -# rm -rf zlib-1.2.12 -# wget http://zlib.net/zlib-1.2.12.tar.gz -# if [ $? -ne 0 ]; then -# echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m" -# exit 1 -# fi -# tar -xf zlib-1.2.12.tar.gz -# cd zlib-1.2.12 - -# CC=mpicc CFLAGS=-fPIC ./configure --prefix=$1/ZLIB -# make -j $2 -# if [ $? -eq 0 ]; then -# make check install -# else -# echo -e "\033[91;5;1m ZLIB Installation FAILED \033[0m" -# exit 1 -# fi -# cd .. - -#else -# echo "ZLIB is already installed" -#fi +if [ ! -d "$1/ZLIB" -a x"$platform" != x"cygwin" ]; then + rm zlib-1.2.11.tar.gz + rm -rf zlib-1.2.11 + wget https://zlib.net/fossils/zlib-1.2.11.tar.gz + if [ $? -ne 0 ]; then + echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m" + exit 1 + fi + tar -xf zlib-1.2.11.tar.gz + cd zlib-1.2.11 + + CC=mpicc CFLAGS=-fPIC ./configure --prefix=$1/ZLIB + make -j $2 + if [ $? -eq 0 ]; then + make check install + else + echo -e "\033[91;5;1m ZLIB Installation FAILED \033[0m" + exit 1 + fi + cd .. + +else + echo "ZLIB is already installed" +fi ### 1.8.19 does not compile on CYGWIN @@ -44,7 +44,7 @@ cd hdf5-1.10.8 # Disable zlib is completly unstable if [ x"$platform" != x"cygwin" ]; then - CC=mpicc ./configure --enable-parallel --prefix=$1/HDF5 + CC=mpicc ./configure --with-zlib=$1/ZLIB --enable-parallel --prefix=$1/HDF5 make -j $2 else CC=mpicc ./configure --enable-parallel --prefix=$1/HDF5