From 62a1162ae31e5cb548528f32275d072f524b980e Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 12 Sep 2024 06:49:48 -0600 Subject: [PATCH 1/2] autoconf cleanup --- acinclude.m4 | 45 --------------------------------------------- configure.ac | 1 - 2 files changed, 46 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index b6420954af..006d487113 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,50 +1,5 @@ dnl UD macros for netcdf configure -dnl -dnl UD_CHECK_IEEE -dnl If the 'double' is not an IEEE double -dnl or the 'float' is not and IEEE single, -dnl define NO_IEEE_FLOAT -dnl -AC_DEFUN([UD_CHECK_IEEE], -[ -AC_MSG_CHECKING(for IEEE floating point format) -AC_TRY_RUN([#ifndef NO_FLOAT_H -#include -#endif - -#define EXIT_NOTIEEE 1 -#define EXIT_MAYBEIEEE 0 - -int -main() -{ -#if defined(FLT_RADIX) && FLT_RADIX != 2 - return EXIT_NOTIEEE; -#elif defined(DBL_MAX_EXP) && DBL_MAX_EXP != 1024 - return EXIT_NOTIEEE; -#elif defined(DBL_MANT_DIG) && DBL_MANT_DIG != 53 - return EXIT_NOTIEEE; -#elif defined(FLT_MAX_EXP) && !(FLT_MAX_EXP == 1024 || FLT_MAX_EXP == 128) - return EXIT_NOTIEEE; -#elif defined(FLT_MANT_DIG) && !(FLT_MANT_DIG == 53 || FLT_MANT_DIG == 24) - return EXIT_NOTIEEE; -#else - /* (assuming eight bit char) */ - if(sizeof(double) != 8) - return EXIT_NOTIEEE; - if(!(sizeof(float) == 4 || sizeof(float) == 8)) - return EXIT_NOTIEEE; - - return EXIT_MAYBEIEEE; -#endif -}],ac_cv_c_ieeefloat=yes, ac_cv_c_ieeefloat=no, :) -AC_MSG_RESULT($ac_cv_c_ieeefloat) -if test "$ac_cv_c_ieeefloat" = no; then - AC_DEFINE([NO_IEEE_FLOAT], [], [no IEEE float on this platform]) -fi -]) - dnl dnl Print which compilers are going to be used, the flags, and their diff --git a/configure.ac b/configure.ac index 33c85470eb..38b186afe6 100644 --- a/configure.ac +++ b/configure.ac @@ -1492,7 +1492,6 @@ AC_SUBST(USEPLUGINS, [${enable_plugins}]) AC_FUNC_ALLOCA AC_CHECK_DECLS([isnan, isinf, isfinite],,,[#include ]) AC_CHECK_MEMBERS([struct stat.st_blksize]) -UD_CHECK_IEEE AC_CHECK_TYPES([size_t, ssize_t, schar, uchar, longlong, ushort, uint, int64, uint64, size64_t, ssize64_t, _off64_t, uint64_t, ptrdiff_t]) AC_TYPE_OFF_T AC_TYPE_UINTPTR_T From 38dcab6567dba061cfc60a38c6090a1bba2d661e Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 12 Sep 2024 07:50:07 -0600 Subject: [PATCH 2/2] fixing configure issues --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index 38b186afe6..7a389cde54 100644 --- a/configure.ac +++ b/configure.ac @@ -227,6 +227,8 @@ AC_MSG_RESULT($enable_dap) if test "x$enable_remote_functionality" = xno ; then AC_MSG_WARN([All network access is disabled => DAP support disabled.]) enable_dap=no + AC_MSG_WARN([All network access is disabled => NCZARR support disabled.]) + enable_nczarr=no fi AC_MSG_CHECKING([whether netcdf zarr storage format should be disabled]) @@ -664,6 +666,13 @@ AC_ARG_ENABLE([quantize], [disable quantize support. It is safe to leave this on unless you specifically need to disable it.])]) test "x$enable_quantize" = xno || enable_quantize=yes +# If HDF5 and nczarr are disabled, there is no quantize. +if test "x${enable_hdf5}" = xno; then + if test "x${enable_nczarr}" = xno; then + enable_quantize=no + fi +fi + AC_MSG_RESULT($enable_quantize) if test "x${enable_quantize}" = xyes; then AC_DEFINE([NETCDF_ENABLE_QUANTIZE], [1], [if true, enable quantize support])