From 726273b84b7947dd4f5ddcd4d79b73ae3026f155 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 4 Feb 2025 00:31:47 +0100
Subject: [PATCH 1/2] Restore missing --has-nc4 in support of
 https://github.com/Unidata/netcdf-c/issues/3063

---
 configure.ac | 1 +
 nc-config.in | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index 2f4b4a22ed..c88ce79d07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2072,6 +2072,7 @@ AC_SUBST(HAS_DAP2,[$enable_dap])
 AC_SUBST(HAS_DAP4,[$enable_dap4])
 AC_SUBST(HAS_LEGACY_MACROS,[$enable_legacy_macros])
 AC_SUBST(HAS_NC2,[$nc_build_v2])
+AC_SUBST(HAS_NC4,[$enable_netcdf4])
 AC_SUBST(HAS_CDF5,[$enable_cdf5])
 AC_SUBST(HAS_HDF4,[$enable_hdf4])
 AC_SUBST(HAS_BENCHMARKS,[$enable_benchmarks])
diff --git a/nc-config.in b/nc-config.in
index 3259b3db16..b924f14057 100644
--- a/nc-config.in
+++ b/nc-config.in
@@ -28,6 +28,7 @@ libsprivate="@LIBS@"
 has_dap="@HAS_DAP@"
 has_dap4="@HAS_DAP4@"
 has_nc2="@HAS_NC2@"
+has_nc4="@HAS_NC4@"
 has_hdf4="@HAS_HDF4@"
 has_pnetcdf="@HAS_PNETCDF@"
 has_hdf5="@HAS_HDF5@"
@@ -61,6 +62,7 @@ Available values for OPTION include:
   --has-dap4          whether DAP4 is enabled in this build
   --has-dap           same as --has-dap2 (Deprecated)
   --has-nc2           whether NetCDF-2 API is enabled
+  --has-nc4           whether NetCDF-4 API is enabled
   --has-hdf5          whether HDF5 is used in build
   --has-hdf4          whether HDF4 was used in build
   --has-logging       whether logging is enabled with --enable-logging.
@@ -104,6 +106,7 @@ all()
         echo "  --has-dap2          -> $has_dap"
         echo "  --has-dap4          -> $has_dap4"
         echo "  --has-nc2           -> $has_nc2"
+        echo "  --has-nc4           -> $has_nc4"
         echo "  --has-hdf5          -> $has_hdf5"
         echo "  --has-hdf4          -> $has_hdf4"
         echo "  --has-logging       -> $has_logging"
@@ -200,6 +203,10 @@ while test $# -gt 0; do
         echo $has_nc2
         ;;
 
+    --has-nc4)
+        echo $has_nc4
+        ;;
+
     --has-hdf5)
         echo $has_hdf5
         ;;

From 15dcffecfbc279a7e7144381013d4930262cbe62 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 3 Feb 2025 16:38:04 -0700
Subject: [PATCH 2/2] Fix persistent spacing issue that seems to keep creeping
 in.

---
 .github/workflows/run_tests_win_cygwin.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
index 7c01e5dd05..1e41192003 100644
--- a/.github/workflows/run_tests_win_cygwin.yml
+++ b/.github/workflows/run_tests_win_cygwin.yml
@@ -93,8 +93,8 @@ jobs:
         with:
           name: cygwin-autotools-test-logs-${{ github.run_id }}
           path: |
-        */*.log
-        */*.trs
+            */*.log
+            */*.trs
   
   build-and-test-cmake:
     name: Cygwin-based CMake tests