mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the network access nomenclature to be less ambiguous. As it stood, did it refer to networked drives? Other things that are network adjacent?

Browse Source
This commit is contained in:
Ward Fisher 2023-06-12 15:23:44 -06:00
parent 67c1192e5b
commit 8c8c10e790
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -524,12 +524,12 @@ if(ENABLE_HDF5 OR ENABLE_HDF4 OR ENABLE_NCZARR)
endif()
# enable|disable all forms of network access
OPTION(ENABLE_NETWORK_ACCESS "Enable|disable all forms of network access" ON)
MESSAGE(">>> ENABLE_NETWORK_ACCESS=${ENABLE_NETWORK_ACCESS}")
if(NOT ENABLE_NETWORK_ACCESS)
MESSAGE(WARNING "ENABLE_NETWORK_ACCESS=NO => ENABLE_DAP[4]=NO")
SET(ENABLE_DAP OFF CACHE BOOL "ENABLE_NETWORK_ACCESS=NO => ENABLE_DAP=NO" FORCE)
SET(ENABLE_DAP4 OFF CACHE BOOL "ENABLE_NETWORK_ACCESS=NO => ENABLE_DAP4=NO" FORCE)
OPTION(ENABLE_REMOTE_FUNCTIONALITY "Enable|disable all forms remote data access (DAP, S3, etc)" ON)
MESSAGE(">>> ENABLE_REMOTE_FUNCTIONALITY=${ENABLE_REMOTE_FUNCTIONALITY}")
if(NOT ENABLE_REMOTE_FUNCTIONALITY)
MESSAGE(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_DAP[4]=NO")
SET(ENABLE_DAP OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_DAP=NO" FORCE)
SET(ENABLE_DAP4 OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_DAP4=NO" FORCE)
ENDIF()
IF(ENABLE_HDF4)
@ -997,8 +997,8 @@ ENDIF()
# Start disabling if curl not found
IF(NOT FOUND_CURL)
MESSAGE(WARNING "ENABLE_NETWORK_ACCESS requires libcurl; disabling")
SET(ENABLE_NETWORK_ACCESS OFF CACHE BOOL "ENABLE_NETWORK_ACCESS requires libcurl; disabling" FORCE)
MESSAGE(WARNING "ENABLE_REMOTE_FUNCTIONALITY requires libcurl; disabling")
SET(ENABLE_REMOTE_FUNCTIONALITY OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY requires libcurl; disabling" FORCE)
ENDIF()
set (CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
@ -1084,9 +1084,9 @@ ENDIF()
# Option to support byte-range reading of remote datasets
OPTION(ENABLE_BYTERANGE "Enable byte-range access to remote datasets.." ON)
if(NOT ENABLE_NETWORK_ACCESS)
MESSAGE(WARNING "ENABLE_NETWORK_ACCESS=NO => ENABLE_BYTERANGE=NO")
SET(ENABLE_BYTERANGE OFF CACHE BOOL "ENABLE_NETWORK_ACCESS=NO => ENABLE_BYTERANGE=NO" FORCE)
if(NOT ENABLE_REMOTE_FUNCTIONALITY)
MESSAGE(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_BYTERANGE=NO")
SET(ENABLE_BYTERANGE OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_BYTERANGE=NO" FORCE)
ENDIF()
@ -1290,7 +1290,7 @@ OPTION(ENABLE_S3 "Enable S3 support." OFF)
OPTION(ENABLE_S3_INTERNAL "Enable S3 Internal support." OFF)
OPTION(ENABLE_NCZARR_S3 "Enable NCZarr S3 support; Deprecated in favor of ENABLE_S3" OFF)
IF(NOT ENABLE_NETWORK_ACCESS)
IF(NOT ENABLE_REMOTE_FUNCTIONALITY)
SET(ENABLE_S3 OFF CACHE BOOL "" FORCE)
SET(ENABLE_S3_INTERNAL OFF CACHE BOOL "" FORCE)
SET(ENABLE_NCZARR_S3 OFF CACHE BOOL "" FORCE)
@ -1313,8 +1313,8 @@ if (NOT ENABLE_S3 AND ENABLE_NCZARR_S3)
ENDIF()
UNSET(ENABLE_NCZARR_S3)
IF(NOT ENABLE_NETWORK_ACCESS)
MESSAGE(WARNING "ENABLE_NETWORK_ACCESS=NO => disable all s3 functionality")
IF(NOT ENABLE_REMOTE_FUNCTIONALITY)
MESSAGE(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => disable all s3 functionality")
SET(ENABLE_S3 OFF CACHE BOOL "" FORCE)
SET(ENABLE_S3_INTERNAL OFF CACHE BOOL "" FORCE)
SET(ENABLE_NCZARR_S3 OFF CACHE BOOL "" FORCE)
@ -2587,7 +2587,7 @@ 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)
is_enabled(ENABLE_NETWORK_ACCESS DO_NETWORK_ACCESS)
is_enabled(ENABLE_REMOTE_FUNCTIONALITY DO_REMOTE_FUNCTIONALITY)
if(ENABLE_S3_INTERNAL)
SET(WHICH_S3_SDK "internal")

20
configure.ac
View File

@ -179,10 +179,10 @@ test "x$enable_pnetcdf" = xyes || enable_pnetcdf=no
AC_MSG_RESULT($enable_pnetcdf)
AC_MSG_CHECKING([whether any network access should be allowed])
AC_ARG_ENABLE([network-access], [AS_HELP_STRING([--enable-network-access],
AC_ARG_ENABLE([remote-functionality], [AS_HELP_STRING([--enable-remote-functionality],
[enable|disable all forms of network access (default enabled)])])
test "x$enable_network_access" = xno || enable_network_access=yes
AC_MSG_RESULT($enable_network_access)
test "x$enable_remote_functionality" = xno || enable_remote_functionality=yes
AC_MSG_RESULT($enable_remote_functionality)
# We need curl for remote operations
AC_CHECK_LIB([curl],[curl_easy_setopt],[found_curl=yes],[found_curl=no])
@ -198,7 +198,7 @@ AC_ARG_ENABLE([dap],
test "x$enable_dap" = xno || enable_dap=yes
AC_MSG_RESULT($enable_dap)
if test "x$enable_network_access" = xno ; then
if test "x$enable_remote_functionality" = xno ; then
AC_MSG_WARN([All network access is disabled => DAP support disabled.])
enable_dap=no
fi
@ -809,8 +809,8 @@ AC_ARG_ENABLE([s3],
test "x$enable_s3" = xyes || enable_s3=no
AC_MSG_RESULT($enable_s3)
if test "x$enable_network_access" = xno ; then
AC_MSG_WARN([--disable-network-access => --disable-s3])
if test "x$enable_remote_functionality" = xno ; then
AC_MSG_WARN([--disable-remote-functionality => --disable-s3])
enable_s3=no
fi
@ -822,7 +822,7 @@ AC_ARG_ENABLE([nczarr-s3],
AC_MSG_RESULT([$enable_nczarr_s3 (Deprecated) Please use --enable-s3)])
# Set enable_s3 instead of enable_nczarr_s3
if test "x$enable_s3" = xno && test "x$enable_nczarr_s3" = xyes && test "x$enable_network_access" = xyes; then
if test "x$enable_s3" = xno && test "x$enable_nczarr_s3" = xyes && test "x$enable_remote_functionality" = xyes; then
enable_s3=yes # back compatibility
fi
unset enable_nczarr_s3
@ -1319,8 +1319,8 @@ AC_ARG_ENABLE([byterange],
test "x$enable_byterange" = xno || enable_byterange=yes
AC_MSG_RESULT($enable_byterange)
if test "x$enable_network_access" = xno ; then
AC_MSG_WARN([--disable-network-access => --disable-byterange])
if test "x$enable_remote_functionality" = xno ; then
AC_MSG_WARN([--disable-remote-functionality => --disable-byterange])
enable_byterange=no
fi
@ -1992,7 +1992,7 @@ AC_SUBST(HAS_SZLIB,[$have_sz])
AC_SUBST(HAS_SZLIB_WRITE, [$have_sz])
AC_SUBST(HAS_ZSTD,[$have_zstd])
AC_SUBST(DO_LARGE_TESTS,[$enable_large_file_tests])
AC_SUBST(DO_NETWORK_ACCESS,[$enable_network_access])
AC_SUBST(DO_REMOTE_FUNCTIONALITY,[$enable_remote_functionality])
if test "x$enable_s3_aws" = xyes ; then
AC_SUBST(WHICH_S3_SDK,[aws-sdk-cpp])