From bc1d1a84bd9a0b692a99f4f6ee0d7ae279929824 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sat, 7 Nov 2020 11:41:40 +0200
Subject: [PATCH] configure: improve guile check

---
 configure.ac | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index bab4d685..6119f5ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,19 +215,25 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"
 # build with guile 3.0/2.2 when available and not disabled.
 AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile]))
 AS_IF([test "x$enable_guile" != "xno"],[
+
   PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
     PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
+
     AS_IF([test "x$have_guile" = "xyes"],[
       GUILE_PKG([3.0 2.2])
       GUILE_PROGS
       GUILE_FLAGS
       AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
       AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
-      AC_SUBST(GUILE_SNARF, [guile-snarf])
+
+      snarf=guile-snarf${GUILE_EFFECTIVE_VERSION}
+      AC_CHECK_PROG(GUILE_SNARF,[${snarf}],[${snarf}], [no])
       guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
    ])
 ])
-AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes"])
+
+AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes" -a \
+                                 "x$ac_cv_prog_GUILE_SNARF" != "xno"])
 ###############################################################################
 
 ###############################################################################