diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2f5420a10a..62a518a81e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -20,6 +20,7 @@ This file contains a high-level description of this package's evolution. Release * [Bug Fix] Fix quantize with CLASSIC_MODEL files. See [Github #2405](https://github.com/Unidata/netcdf-c/pull/2445). * [Enhancement] Add `--disable-quantize` option to `configure`. * [Bug Fix] Fix CMakeLists.txt to handle all acceptable boolean values for -DPLUGIN_INSTALL_DIR. See [Github #2430](https://github.com/Unidata/netcdf-c/pull/2430). +* [Bug Fix] Fix tst_vars3.c to use the proper szip flag. See [Github #2421](https://github.com/Unidata/netcdf-c/pull/2421). * [Enhancement] Provide a simple API to allow user access to the internal .rc file table: supports get/set/overwrite of entries of the form "key=value". See [Github #2408](https://github.com/Unidata/netcdf-c/pull/2408). * [Bug Fix] Use env variable USERPROFILE instead of HOME for windows and mingw. See [Github #2405](https://github.com/Unidata/netcdf-c/pull/2405). * [Bug Fix] Fix the nc_def_var_fletcher32 code in hdf5 to properly test value of the fletcher32 argument. See [Github #2403](https://github.com/Unidata/netcdf-c/pull/2403). @@ -59,7 +60,6 @@ for domain specific info such as used by GDAL/Zarr. See [Github #2278](https://g * [Bug Fix] Ensure that internal Fortran APIs are always defined. See [Github #2098](https://github.com/Unidata/netcdf-c/pull/2098). * [Enhancement] Support filters for NCZarr. See [Github #2101](https://github.com/Unidata/netcdf-c/pull/2101) * [Bug Fix] Make PR 2075 long file name be idempotent. See [Github #2094](https://github.com/Unidata/netcdf-c/pull/2094). - ## 4.8.1 - August 18, 2021 * [Bug Fix] Fix multiple bugs in libnczarr. See [Github #2066](https://github.com/Unidata/netcdf-c/pull/2066). diff --git a/configure.ac b/configure.ac index 31322216ab..911de89af6 100644 --- a/configure.ac +++ b/configure.ac @@ -1921,16 +1921,10 @@ AC_SUBST(HAS_ZSTD,[$have_zstd]) # Always available std_filters="deflate bz2" + if test "x$enable_szlib" = xyes ; then std_filters="${std_filters} szip" fi -# We need to include szip iff HDF5 && HDF5_HAS_SZIP || !HDF5 && NCZARR && libsz -if test "x$enable_hdf5" = xyes && test "x$enable_hdf5_szip" = xyes ; then - std_filters="${std_filters} szip" -fi -if test "x$enable_hdf5" = xno && test "x$have_sz" = xyes ; then -std_filters="${std_filters} szip" -fi if test "x$have_blosc" = xyes ; then std_filters="${std_filters} blosc" fi diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in index d9f90ebeee..019db6ba98 100644 --- a/include/netcdf_meta.h.in +++ b/include/netcdf_meta.h.in @@ -43,8 +43,8 @@ #define NC_HAS_NC4 @NC_HAS_NC4@ /*!< API version 4 support. */ #define NC_HAS_HDF4 @NC_HAS_HDF4@ /*!< HDF4 support. */ #define NC_HAS_HDF5 @NC_HAS_HDF5@ /*!< HDF5 support. */ -#define NC_HAS_SZIP @NC_HAS_SZIP@ /*!< szip support (HDF5 only) */ -#define NC_HAS_SZIP_WRITE @NC_HAS_SZIP@ /*!< szip write support (HDF5 only) */ +#define NC_HAS_SZIP @NC_HAS_SZIP@ /*!< szip support */ +#define NC_HAS_SZIP_WRITE @NC_HAS_SZIP@ /*!< szip write support */ #define NC_HAS_DAP2 @NC_HAS_DAP2@ /*!< DAP2 support. */ #define NC_HAS_DAP4 @NC_HAS_DAP4@ /*!< DAP4 support. */ #define NC_HAS_BYTERANGE @NC_HAS_BYTERANGE@ /*!< Byterange support. */