o Modified configure.ac to check for the official zlib static library.

o Updated static 64-bit nc4 configure script.
This commit is contained in:
Ward Fisher 2012-05-29 21:13:00 +00:00
parent a5c4bf581f
commit 054db9fb64
2 changed files with 2 additions and 2 deletions

View File

@ -632,7 +632,7 @@ AC_CHECK_SIZEOF(off_t)
AC_CHECK_SIZEOF(size_t)
if test "x$enable_netcdf_4" = xyes || test "x$enable_dap" = xyes; then
AC_SEARCH_LIBS([deflate], [zlib zlib1 z zlibwapi], [], [
AC_SEARCH_LIBS([deflate], [zlib zlib1 z zlibwapi zlibstat], [], [
AC_MSG_ERROR([Can't find or link to the z library. Turn off netCDF-4 and \
opendap with --disable-netcdf-4 --disable-dap, or see config.log for errors.])])
fi

View File

@ -1,6 +1,6 @@
#!/bin/bash
set -x
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --enable-diskless --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -O0 -L/c/HDF5189/bin -L/c/HDF5189/lib"
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --enable-diskless --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64_static/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_static/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"