Moved the check for szip libraries so that it is only sought out if hdf5 includes szip support.

This commit is contained in:
Ward Fisher 2012-11-09 23:11:01 +00:00
parent 45f77090a1
commit 645d1dbaaf

View File

@ -659,7 +659,6 @@ if test "x$enable_netcdf_4" = xyes; then
AC_DEFINE([USE_NETCDF4], [1], [if true, build netCDF-4]) AC_DEFINE([USE_NETCDF4], [1], [if true, build netCDF-4])
AC_DEFINE([H5_USE_16_API], [1], [use HDF5 1.6 API]) AC_DEFINE([H5_USE_16_API], [1], [use HDF5 1.6 API])
AC_SEARCH_LIBS([SZ_Compress], [szip sz], [], [])
# Check for the main hdf5 and hdf5_hl library. # Check for the main hdf5 and hdf5_hl library.
@ -712,7 +711,8 @@ dnl fi
# The user may have built HDF5 with the SZLIB library. # The user may have built HDF5 with the SZLIB library.
if test "x$ac_cv_func_H5Z_SZIP" = xyes; then if test "x$ac_cv_func_H5Z_SZIP" = xyes; then
AC_DEFINE([USE_SZIP], [1], [if true, compile in szip compression in netCDF-4 variables]) AC_SEARCH_LIBS([SZ_Compress], [szip sz], [], [])
AC_DEFINE([USE_SZIP], [1], [if true, compile in szip compression in netCDF-4 variables])
fi fi
# If the user wants hdf4 built in, check it out. # If the user wants hdf4 built in, check it out.