From 36297b047096d1a8e321162031a38997a0b839d1 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 11 Sep 2024 16:09:55 -0500
Subject: [PATCH] Clean up and reorganize a bit, add logic so that byterange
 support is disabled when the functionality it requires has been disabled.

---
 configure.ac | 49 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 023e428e1..c007f81b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,29 +462,39 @@ else
    enable_set_log_level=no
 fi
 
+# Does the user want to allow reading of remote data via range headers?
+AC_MSG_CHECKING([whether byte range support is enabled])
+AC_ARG_ENABLE([byterange],
+              [AS_HELP_STRING([--disable-byterange],
+                              [allow byte-range I/O])])
+test "x$enable_byterange" = xno || enable_byterange=yes
+AC_MSG_RESULT($enable_byterange)
 
-# CURLOPT_USERNAME is not defined until curl version 7.19.1
-# CURLOPT_PASSWORD is not defined until curl version 7.19.1
-# CURLOPT_KEYPASSWD is not defined until curl version 7.16.4
-# CURLINFO_RESPONSE_CODE is not defined until curl version 7.10.7
-# CURLOPT_CHUNK_BGN_FUNCTION is not defined until curl version 7.21.0
-# CURL_MAX_READ_SIZE is not defined until 7.59
+if test "x$enable_dap" = xno && test "x$enable_byterange" = xyes; then 
+   AC_MSG_WARN([DAP required for byterange. Byterange support disabled.])
+   enable_byterange=no
+fi
+
+###
+# Stanza to check for functionality which requires linking against
+# libcurl.
+###
 
-# Save/restore CFLAGS
 if test "x$enable_dap" = xyes || test "x$enable_nczarr" = xyes; then 
    enable_curl=yes
 fi
 
 if test "x$enable_curl" = xyes; then
 
-   if test "x$enable_dap" = xyes & test "x$found_curl" = xno ; then
+
+   if test "x$enable_dap" = xyes && test "x$found_curl" = xno ; then
       AC_MSG_WARN([curl required for dap access. DAP support disabled.])
       enable_dap=no
    fi
 
    # Need curl for byte ranges
    if test "x$found_curl" = xno && test "x$enable_byterange" = xyes ; then
-   AC_MSG_ERROR([curl required for byte range support. Install curl or build without --enable-byterange.])
+   AC_MSG_WARN([curl required for byte range support. Install curl or build without --enable-byterange.])
    enable_byterange=no
    fi
 
@@ -502,9 +512,17 @@ if test "x$enable_curl" = xyes; then
    enable_dap=no
    fi
 
+   # Save/restore CFLAGS
    SAVECFLAGS="$CFLAGS"
    CFLAGS="${curl_cflags}"
 
+   # CURLOPT_USERNAME is not defined until curl version 7.19.1
+   # CURLOPT_PASSWORD is not defined until curl version 7.19.1
+   # CURLOPT_KEYPASSWD is not defined until curl version 7.16.4
+   # CURLINFO_RESPONSE_CODE is not defined until curl version 7.10.7
+   # CURLOPT_CHUNK_BGN_FUNCTION is not defined until curl version 7.21.0
+   # CURL_MAX_READ_SIZE is not defined until 7.59
+
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
    [#include "curl/curl.h"],
    [[int x = CURLOPT_USERNAME;]])],
@@ -587,6 +605,11 @@ if test "x$enable_curl" = xyes; then
 
    CFLAGS="$SAVECFLAGS"
 fi
+
+###
+# End libcurl-related stanza
+###
+
 ###
 # Libxml2 control block.
 ###
@@ -1403,13 +1426,7 @@ if test "x$enable_mmap" = xyes; then
     AC_DEFINE([USE_MMAP], [1], [if true, use mmap for in-memory files])
 fi
 
-# Does the user want to allow reading of remote data via range headers?
-AC_MSG_CHECKING([whether byte range support is enabled])
-AC_ARG_ENABLE([byterange],
-              [AS_HELP_STRING([--disable-byterange],
-                              [allow byte-range I/O])])
-test "x$enable_byterange" = xno || enable_byterange=yes
-AC_MSG_RESULT($enable_byterange)
+
 
 if test "x$enable_remote_functionality" = xno ; then
   AC_MSG_WARN([--disable-remote-functionality => --disable-byterange])