From 7de28ed7835d84a605f21a205d542dcbc896c9cb Mon Sep 17 00:00:00 2001
From: James Gallagher <jgallagher@opendap.org>
Date: Wed, 4 Feb 2026 11:46:59 -0700
Subject: [PATCH 1/2] Remove the GDAL_OPTION=--without-gdal from Travis

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f467891507..932ffad730 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,8 @@ env:
     # Should the BES build with GDAL? This is here to round up build errors. Set this
     # to the 'configure' script option to use (--with-gdal) or not use (--without-gdal).
     # jhrg 12/2/25
-    - GDAL_OPTION=--without-gdal
+    # Turn this off - build and test GDAL-related modules again. jhrg 2/4/26
+    # GDAL_OPTION=--without-gdal
     # NB: This value of $prefix must be shared between the hyrax-deps, libdap and bes builds.
     - prefix=$HOME/install
     - PATH=$prefix/bin:$prefix/deps/bin:$PATH

From e656938038af9c6340874937bf02d85e830d1268 Mon Sep 17 00:00:00 2001
From: James Gallagher <jgallagher@opendap.org>
Date: Fri, 3 Apr 2026 11:34:05 -0600
Subject: [PATCH 2/2] Will setting GDAL_OPTION to --with-gdal trigger all-gdal
 builds?

---
 .travis.yml                |  7 ++++---
 .vscode/jhrg/settings.json | 11 +++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e828ffb1e..0b40fa0d88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,8 @@ cache:
     - ./.cache/sonar/
 
 addons:
-  sonarcloud: true
+  sonarcloud:
+    organization: "opendap"
   apt:
     packages:
       - uuid-dev
@@ -55,7 +56,7 @@ env:
     # to the 'configure' script option to use (--with-gdal) or not use (--without-gdal).
     # jhrg 12/2/25
     # Turn this off - build and test GDAL-related modules again. jhrg 2/4/26
-    # GDAL_OPTION=--without-gdal
+    - GDAL_OPTION=--with-gdal
     # NB: This value of $prefix must be shared between the hyrax-deps, libdap and bes builds.
     - prefix=$HOME/install
     - PATH=$prefix/bin:$prefix/deps/bin:$PATH
@@ -158,7 +159,7 @@ jobs:
       script:
         - export BES_BUILD=distcheck
         - autoreconf --force --install --verbose
-        - ./configure --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps $GDAL_OPTION--enable-developer
+        - ./configure --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps $GDAL_OPTION --enable-developer
         - make distcheck -j16 GZIP_ENV=--fast
 
     - stage: build-and-test
diff --git a/.vscode/jhrg/settings.json b/.vscode/jhrg/settings.json
index a00f09a687..ab0d2a30a7 100644
--- a/.vscode/jhrg/settings.json
+++ b/.vscode/jhrg/settings.json
@@ -1,6 +1,6 @@
 {
     // For Hyrax, prefix and PATH need to be set. jhrg 3/11/26
-    "prefix": "/Users/jimg/src/opendap/hyrax_git/build",
+    "prefix": "/Users/jimg/src/opendap/hyrax/build",
     "PATH": "${config:prefix}/bin:${config:prefix}/deps/bin:${env:PATH}",
     // C/C++ extensionsettings. jhrg 3/11/26
     "C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools",
@@ -44,5 +44,12 @@
     "terminal.integrated.env.linux": {
         "prefix": "${config:prefix}",
         "PATH": "${config:PATH}"
-    }
+    },
+    "cSpell.words": [
+        "autotest",
+        "LIBDAP",
+        "opendap",
+        "rockylinux",
+        "sonarcloud"
+    ]
 }
\ No newline at end of file