From 366acfa495dc9b3da243abe173c22be716e396ce Mon Sep 17 00:00:00 2001
From: Eric Branlund <ebranlund@fastmail.com>
Date: Sun, 9 Jul 2023 10:38:37 -0600
Subject: [PATCH] Fix up workflows for libcurl dependence

---
 .github/workflows/release.yaml          |  2 +-
 .github/workflows/test-linux-build.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index dc23dbbad..52b0442fb 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -154,7 +154,7 @@ jobs:
           out="${{ steps.store_config.outputs.name }}"-"${{ steps.store_config.outputs.version }}"
           echo "archive_file=${out}.tar.gz" >> $GITHUB_OUTPUT
           ./bootstrap
-          ./configure --disable-japanese --disable-worldscore
+          ./configure --disable-japanese --disable-net
           make distdir
           mv "${{ steps.store_config.outputs.name }}"-* "$out"
           tar -cBf - "$out" | gzip -c - >"$out".tar.gz
diff --git a/.github/workflows/test-linux-build.yaml b/.github/workflows/test-linux-build.yaml
index 503cec7c3..ea329e501 100644
--- a/.github/workflows/test-linux-build.yaml
+++ b/.github/workflows/test-linux-build.yaml
@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # This will be passed to all invocations of configure for this test.
-      # Could drop --disable-worldscore if libcurl is installed.
-      DEFAULT_CONFIGURE_OPTIONS: --disable-japanese --disable-worldscore
+      # Could drop --disable-net if libcurl is installed.
+      DEFAULT_CONFIGURE_OPTIONS: --disable-japanese --disable-net
 
     steps:
       - name: Clone Project
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # This will be passed to all invocations of configure for this test.
-      DEFAULT_CONFIGURE_OPTIONS: --disable-worldscore --disable-pch
+      DEFAULT_CONFIGURE_OPTIONS: --disable-pch
 
     steps:
       - name: Clone Project
@@ -59,11 +59,11 @@ jobs:
         with:
           submodules: true
 
-      # Requires automake, autoconf, and, unless building the
-      # 1.6.2 version, nkf; install those via apt-get.
-      # macos-latest).
+      # Requires automake, autoconf, and, unless building the 1.6.2 version,
+      # nkf.  Hengband 3.0.0 now requires libcurl if not configured with
+      # --disable-net.  Install those via apt-get.
       - name: Install Build Dependencies
-        run: sudo apt-get install automake autoconf nkf
+        run: sudo apt-get install automake autoconf nkf libcurl
 
       - name: Build
         run: |
-- 
2.11.0