Merge pull request #2512 from WardF/meta_h_change.wif

Fix inconsistency in netcdf_meta.h
Unidata · Sep 20, 2022 · f28d0e2 · f28d0e2
2 parents 7fec75d + 59bfd82
commit f28d0e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2544,6 +2544,8 @@ is_enabled(ENABLE_FILTER_TESTING DO_FILTER_TESTS)
 is_enabled(HAVE_SZ HAS_SZIP)
 is_enabled(HAVE_SZ HAS_SZLIB_WRITE)
 is_enabled(HAVE_ZSTD HAS_ZSTD)
+is_enabled(HAVE_BLOSC HAS_BLOSC)
+is_enabled(HAVE_BZ2 HAS_BZ2)
 
 # Generate file from template.
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.1 - T.B.D.
 
+* [Enhancement] Add new entries in `netcdf_meta.h`, `NC_HAS_BLOSC` and `NC_HAS_BZ2`. See [Github #2511](https://github.com/Unidata/netcdf-c/issues/2511) and [Github #2512](https://github.com/Unidata/netcdf-c/issues/2512) for more information.
 * [Enhancement] Add new options to `nc-config`: `--has-multifilters`, `--has-stdfilters`, `--has-quantize`, `--plugindir`.  See [Github #2509](https://github.com/Unidata/netcdf-c/pull/2509) for more information.
 * [Bug Fix] Fix some errors detected in PR 2497. [PR #2497](https://github.com/Unidata/netcdf-c/pull/2497) . See [Github #2503](https://github.com/Unidata/netcdf-c/pull/2503).
 * [Bug Fix] Split the remote tests into two parts: one for the remotetest server and one for all other external servers. Also add a configure option to enable the latter set. See [Github #2491](https://github.com/Unidata/netcdf-c/pull/2491).

diff --git a/configure.ac b/configure.ac
@@ -2055,7 +2055,8 @@ AX_SET_META([NC_HAS_LOGGING],[$enable_logging],[yes])
 AX_SET_META([NC_HAS_QUANTIZE],[$enable_quantize],[yes])
 AX_SET_META([NC_HAS_SZIP],[$enable_hdf5_szip],[yes])
 AX_SET_META([NC_HAS_ZSTD],[$have_zstd],[yes])
-
+AX_SET_META([NC_HAS_BLOSC],[$have_blosc],[yes])
+AX_SET_META([NC_HAS_BZ2],[$have_bz2],[yes])
 # This is the version of the dispatch table. If the dispatch table is
 # changed, this should be incremented, so that user-defined format
 # applications like PIO can determine whether they have an appropriate

diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in
@@ -67,4 +67,7 @@
 #define NC_HAS_ZSTD          @NC_HAS_ZSTD@ /*!< Zstd support. */
 #define NC_HAS_BENCHMARKS    @NC_HAS_BENCHMARKS@ /*!< Benchmarks. */
 
+#define NC_HAS_BLOSC         @NC_HAS_BLOSC@ /*!< Blosc Support. */
+#define NC_HAS_BZ2           @NC_HAS_BZ2@ /*!< bzip2 support */
+
 #endif