From 0218fc6e548173ae95b51edb6a2aea0ff57d08e8 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 24 Aug 2021 00:17:03 -0600 Subject: [PATCH] added info about logging to build summary, fixed info about byterange in build summary --- CMakeLists.txt | 1 + configure.ac | 2 ++ include/netcdf_meta.h.in | 17 +++++++++-------- libnetcdf.settings.in | 2 ++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1b620fee..498cf8975 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2188,6 +2188,7 @@ is_enabled(ENABLE_NCZARR HAS_NCZARR) is_enabled(ENABLE_NCZARR_S3_TESTS DO_NCZARR_S3_TESTS) is_enabled(ENABLE_MULTIFILTERS HAS_MULTIFILTERS) is_enabled(ENABLE_NCZARR_ZIP DO_NCZARR_ZIP_TESTS) +is_enabled(ENABLE_LOGGING HAS_LOGGING) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in" diff --git a/configure.ac b/configure.ac index ed0dd1f11..2206b9225 100644 --- a/configure.ac +++ b/configure.ac @@ -1649,6 +1649,7 @@ AC_SUBST(HAS_NCZARR,[$enable_nczarr]) AC_SUBST(DO_NCZARR_S3_TESTS,[$enable_nczarr_s3_tests]) AC_SUBST(HAS_MULTIFILTERS,[$has_multifilters]) AC_SUBST(DO_NCZARR_ZIP_TESTS,[$enable_nczarr_zip]) +AC_SUBST(HAS_LOGGING,[$enable_logging]) # Include some specifics for netcdf on windows. #AH_VERBATIM([_WIN32_STRICMP], @@ -1721,6 +1722,7 @@ AX_SET_META([NC_HAS_PAR_FILTERS], [$hdf5_supports_par_filters],[yes]) AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes]) AX_SET_META([NC_HAS_NCZARR],[$enable_nczarr],[yes]) AX_SET_META([NC_HAS_MULTIFILTERS],[$has_multifilters],[yes]) +AX_SET_META([NC_HAS_LOGGING],[$enable_logging],[yes]) # This is the version of the dispatch table. If the dispatch table is # changed, this should be incremented, so that user-defined format diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in index 340d53f74..91665a4ce 100644 --- a/include/netcdf_meta.h.in +++ b/include/netcdf_meta.h.in @@ -47,7 +47,7 @@ #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@ +#define NC_HAS_BYTERANGE @NC_HAS_BYTERANGE@ /*!< Byterange support. */ #define NC_HAS_DISKLESS @NC_HAS_DISKLESS@ /*!< diskless support. */ #define NC_HAS_MMAP @NC_HAS_MMAP@ /*!< mmap support. */ #define NC_HAS_JNA @NC_HAS_JNA@ /*!< jna support. */ @@ -55,12 +55,13 @@ #define NC_HAS_PARALLEL4 @NC_HAS_PARALLEL4@ /*!< parallel IO support via HDF5 */ #define NC_HAS_PARALLEL @NC_HAS_PARALLEL@ /*!< parallel IO support via HDF5 and/or PnetCDF. */ -#define NC_HAS_CDF5 @NC_HAS_CDF5@ /*!< CDF5 support. */ -#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. */ -#define NC_HAS_NCZARR @NC_HAS_NCZARR@ -#define NC_HAS_MULTIFILTERS @NC_HAS_MULTIFILTERS@ +#define NC_HAS_CDF5 @NC_HAS_CDF5@ /*!< CDF5 support. */ +#define NC_HAS_ERANGE_FILL @NC_HAS_ERANGE_FILL@ /*!< ERANGE_FILL Support. */ +#define NC_RELAX_COORD_BOUND 1 /*!< Always allow 0 counts in parallel I/O. */ +#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. */ +#define NC_HAS_NCZARR @NC_HAS_NCZARR@ /*!< Parallel I/O with filter support. */ +#define NC_HAS_MULTIFILTERS @NC_HAS_MULTIFILTERS@ /*!< Nczarr support. */ +#define NC_HAS_LOGGING @NC_HAS_LOGGING@ /*!< Logging support. */ #endif diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in index 0cc38514e..faa80a806 100644 --- a/libnetcdf.settings.in +++ b/libnetcdf.settings.in @@ -45,3 +45,5 @@ SZIP Write Support: @HAS_SZLIB_WRITE@ Parallel Filters: @HAS_PAR_FILTERS@ NCZarr Support: @HAS_NCZARR@ Multi-Filter Support: @HAS_MULTIFILTERS@ +Logging: @HAS_LOGGING@ +