From 0a0282716d3a7b09f42ac45b1121e47c32143a8b Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 16 Jan 2020 09:19:24 -0700 Subject: [PATCH] added to libnetcdf.settings and netcdf_meta.h --- configure.ac | 4 ++++ include/netcdf_meta.h.in | 3 ++- libnetcdf.settings.in | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 505c33f60..e0f4d9646 100644 --- a/configure.ac +++ b/configure.ac @@ -1023,6 +1023,7 @@ if test "x$enable_netcdf_4" = xyes; then fi hdf5_parallel=no +hdf5_supports_par_filters=no if test "x$enable_hdf5" = xyes; then AC_DEFINE([USE_HDF5], [1], [if true, use HDF5]) @@ -1057,9 +1058,11 @@ if test "x$enable_hdf5" = xyes; then # Check to see if HDF5 library is 1.10.2 or greater. If so, allows parallel_zip. if test "x$ac_cv_func_H5DOread_chunk" = xyes; then AC_DEFINE([HDF5_SUPPORTS_PAR_FILTERS], [1], [if true, HDF5 is at least version 1.10.2 and allows parallel I/O with zip]) + hdf5_supports_par_filters=yes fi AC_MSG_CHECKING([whether HDF5 is version 1.10.2 or greater]) AC_MSG_RESULT([$ac_cv_func_H5DOread_chunk]) + AC_SUBST([HAS_PAR_FILTERS], [$hdf5_supports_par_filters]) # Check to see if we need to search for and link against szlib. if test "x$ac_cv_func_H5Z_SZIP" = xyes; then @@ -1490,6 +1493,7 @@ AX_SET_META([NC_HAS_PARALLEL],[$enable_parallel],[yes]) AX_SET_META([NC_HAS_PARALLEL4],[$enable_parallel4],[yes]) AX_SET_META([NC_HAS_CDF5],[$enable_cdf5],[yes]) AX_SET_META([NC_HAS_ERANGE_FILL], [$enable_erange_fill],[yes]) +AX_SET_META([NC_HAS_PAR_FILTERS], [$hdf5_supports_par_filters],[yes]) AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes]) AC_SUBST([NC_DISPATCH_VERSION], [1]) ##### diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in index de44e7286..fe74d7d1e 100644 --- a/include/netcdf_meta.h.in +++ b/include/netcdf_meta.h.in @@ -44,6 +44,7 @@ #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_DAP2 @NC_HAS_DAP2@ /*!< DAP2 support. */ #define NC_HAS_DAP4 @NC_HAS_DAP4@ /*!< DAP4 support. */ #define NC_HAS_BYTERANGE @HAS_BYTERANGE@ @@ -58,5 +59,5 @@ #define NC_HAS_ERANGE_FILL @NC_HAS_ERANGE_FILL@ /*!< ERANGE_FILL Support */ #define NC_RELAX_COORD_BOUND 1 /*!< RELAX_COORD_BOUND */ #define NC_DISPATCH_VERSION @NC_DISPATCH_VERSION@ /*!< Dispatch table version */ - +#define NC_HAS_PAR_FILTERS @NC_HAS_PAR_FILTERS@ /* Parallel I/O with filter support. */ #endif diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in index f26a8f5aa..6af76e4c3 100644 --- a/libnetcdf.settings.in +++ b/libnetcdf.settings.in @@ -41,3 +41,5 @@ CDF5 Support: @HAS_CDF5@ ERANGE Fill Support: @HAS_ERANGE_FILL@ Relaxed Boundary Check: yes SZIP Support: @HAS_SZLIB@ +SZIP Write Support: @HAS_SZLIB@ +Parallel Filters: @HAS_PAR_FILTERS@