From ed590d40765128338083f5f19e41f6e45dbc7c67 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 27 Nov 2020 14:08:16 -0700
Subject: [PATCH 1/2] remove actions file

---
 .github/workflows/automake.yml | 43 ----------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 .github/workflows/automake.yml

diff --git a/.github/workflows/automake.yml b/.github/workflows/automake.yml
deleted file mode 100644
index 17dbcd0286..0000000000
--- a/.github/workflows/automake.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: automake
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: cache-hdf5-test
-      id: cache-hdf5-test
-      uses: actions/cache@v2
-      with:
-        path: ~/hdf5
-        key: hdf5-${{ runner.os }}-1.10.7-test
-
-    - name: build-hdf5
-      if: steps.cache-hdf5-test.outputs.cache-hit != 'true'
-      run: |
-        set -x
-        wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.7/src/hdf5-1.10.7.tar.gz
-        tar -xzf hdf5-1.10.7.tar.gz
-        pushd hdf5-1.10.7
-        ./configure --prefix=/home/runner/hdf5 --disable-tools --disable-fortran --disable-cxx
-        make check
-        sudo make install
-        popd
-    - name: autoreconf
-      run: autoreconf -i --force
-    - name: configure
-      run: ./configure --enable-nczarr --disable-nczarr-s3 --disable-filter-testing
-    - name: make
-      run: make
-    - name: make check
-      run: make check
-    - name: make distcheck
-      run: make distcheck

From 68bcd1122a0658fd2fc9f13444a9c7b5da63f069 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Sat, 28 Nov 2020 13:00:06 -0700
Subject: [PATCH 2/2] Enforce that !ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3

This is a follow on to PR https://github.com/Unidata/netcdf-c/pull/1890

Modify configure.ac to enforce that
!ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3
---
 configure.ac       | 2 +-
 libhdf5/hdf5file.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a63182a083..779ef8f3c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,7 +1206,7 @@ if test "x$enable_hdf5" = xyes; then
 
    # See if hdf5 library supports Read-Only S3 (byte-range) driver
    AC_SEARCH_LIBS([H5Pset_fapl_ros3],[hdf5_hldll hdf5_hl], [has_ros3=yes], [has_ros3=no])
-   if test "x$has_ros3" = xyes; then
+   if test "x$has_ros3" = xyes && test "x$enable_byterange" = xyes; then
     AC_DEFINE([ENABLE_HDF5_ROS3], [1], [if true, support byte-range using hdf5 virtual file driver.])
    fi
 
diff --git a/libhdf5/hdf5file.c b/libhdf5/hdf5file.c
index c4f5edc99d..bdb4ddcb4b 100644
--- a/libhdf5/hdf5file.c
+++ b/libhdf5/hdf5file.c
@@ -223,9 +223,11 @@ nc4_close_netcdf4_file(NC_FILE_INFO_T *h5, int abort, NC_memio *memio)
      * hidden attribute. */
     NC4_clear_provenance(&h5->provenance);
 
+#if defined(ENABLE_BYTERANGE) || defined(ENABLE_HDF5_ROS3) || defined(ENABLE_S3_SDK)
     /* Free the http info */
     ncurifree(hdf5_info->http.uri);
     NC_authfree(hdf5_info->http.auth);
+#endif
 
     /* Close hdf file. It may not be open, since this function is also
      * called by NC_create() when a file opening is aborted. */