From 88f5f92b7221b10a879b97691c60ddf609be00d3 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Mon, 18 Oct 2021 22:31:44 +0300
Subject: [PATCH] build: fix macos/clang build (disable guile)

  error: invalid argument '-std=gnu11' not allowed with 'C++'
---
 .github/workflows/build-and-test.yml | 2 +-
 autogen.sh                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0793144b..e1b7f112 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -30,7 +30,7 @@ jobs:
           brew install meson ninja libgpg-error libtool pkg-config glib gmime xapian
 
       - name: configure
-        run: ./autogen.sh --disable-guile
+        run: ./autogen.sh -Dguile=disabled
 
       - name: build
         run: make
diff --git a/autogen.sh b/autogen.sh
index d674afb3..eac4d6b7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ fi
 
 # we could remove build/ but let's avoid rm -rf risks...
 if test -d ${BUILDDIR}; then
-    meson --reconfigure ${BUILDDIR}
+    meson --reconfigure ${BUILDDIR} $@
 else
     meson ${BUILDDIR} $@
 fi