From 3fe0a6440c4a4b5dddf35186508408681cc15565 Mon Sep 17 00:00:00 2001
From: David Declerck <david.declerck@ocamlpro.com>
Date: Mon, 13 May 2024 14:21:57 +0200
Subject: [PATCH] Fix MacOS CI

---
 .github/workflows/macos.yml | 16 ++++++----------
 configure.ac                |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 63eeb09e3..ffc2dcec1 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -26,15 +26,11 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install automake help2man texinfo bison berkeley-db@4
-          opt="/usr/local/opt"; \
-          for d in automake help2man bison texinfo berkeley-db@4; do \
-            test -d "$opt/$d/bin" && echo "$opt/$d/bin" >> $GITHUB_PATH; \
-            test -d "$opt/$d/lib" && export LDFLAGS="-L$opt/$d/lib $LDFLAGS"; \
-            test -d "$opt/$d/include" && export CPPFLAGS="-I$opt/$d/include $CPPFLAGS"; \
-          done; \
-          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV; \
-          echo "CPPFLAGS=${CPPFLAGS}" >> $GITHUB_ENV
+          brew install pkg-config automake libtool help2man texinfo bison berkeley-db@4 json-c
+          opt="/opt/homebrew/opt"
+          echo "$opt/pkg-config/bin" >> $GITHUB_PATH
+          echo "LDFLAGS=-L$opt/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$opt/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV
 
       - name: Set git user
         run: |
@@ -64,7 +60,7 @@ jobs:
         with:
           name: config.log
           path: _build/config.log
-#       if: failure()
+        if: failure()
 
       - name: make
         run: |
diff --git a/configure.ac b/configure.ac
index e6aded1e7..83b56cdd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2307,7 +2307,7 @@ case $host_os in
 	fi
 	#COB_FIX_LIB=""
 	;;
-  darwin* | rhapsody*)
+  rhapsody*)
 	if test "$COB_USES_GCC" = yes; then
 		COB_SHARED_OPT="-bundle -flat_namespace -undefined suppress"
 	fi