From 1a449dd8850532c55cc304aa49f0b2310ef5a10e Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Fri, 15 Oct 2021 08:20:33 +0300
Subject: [PATCH] meson.build: Improve guile detection

---
 lib/meson.build |  1 +
 meson.build     | 45 +++++++++++++++++++++------------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index dfb0eead..bd661b4c 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -73,6 +73,7 @@ lib_mu=static_library(
     gio_dep,
     gmime_dep,
     xapian_dep,
+    guile_dep,
     config_h_dep,
     lib_mu_utils_dep,
     lib_mu_index_dep
diff --git a/meson.build b/meson.build
index dfebd630..28569947 100644
--- a/meson.build
+++ b/meson.build
@@ -78,6 +78,11 @@ config_h_data.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' +
 config_h_data.set_quoted('VERSION', meson.project_version())
 config_h_data.set_quoted('PACKAGE_NAME', meson.project_name())
 
+add_project_arguments(['-DHAVE_CONFIG_H'], language: 'c')
+add_project_arguments(['-DHAVE_CONFIG_H'], language: 'cpp')
+config_h_dep=declare_dependency(
+  include_directories: include_directories(['.']))
+
 functions=[
   'setsid'
 ]
@@ -103,6 +108,14 @@ gmime_dep      = dependency('gmime-3.0', version: '>= 3.2')
 xapian_dep     = dependency('xapian-core', version:'>= 1.4')
 thread_dep     = dependency('threads')
 
+# soft dependencies
+guile_dep = dependency('guile-3.0', required: get_option('guile'))
+
+if get_option('toys').enabled()
+  gtk_dep = dependency('gtk+-3.0')
+  webkit_dep = dependency('webkit2gtk-4.0')
+endif
+
 awk=find_program(['gawk', 'awk'])
 
 # soft dependencies
@@ -129,29 +142,6 @@ if get_option('readline').enabled()
   config_h_data.set('HAVE_READLINE_HISTORY_H', 1)
 endif
 
-# guile
-guile_deps=[]
-if get_option('guile').enabled()
-  guile_dep = dependency('guile-3.0')
-endif
-
-# toys.
-gtk_dep=[]
-webkit_dep=[]
-if get_option('toys').enabled()
-  gtk_dep = dependency('gtk+-3.0')
-  webkit_dep = dependency('webkit2gtk-4.0')
-endif
-
-
-################################################################################
-# write-out config.h.
-configure_file(output : 'config.h', configuration : config_h_data)
-add_project_arguments(['-DHAVE_CONFIG_H'], language: 'c')
-add_project_arguments(['-DHAVE_CONFIG_H'], language: 'cpp')
-config_h_dep=declare_dependency(
-  include_directories: include_directories(['.']))
-
 
 ################################################################################
 # write out version.texi (for texiinfo builds in mu4e, guile)
@@ -184,7 +174,9 @@ if emacs.found()
    subdir('mu4e')
 endif
 
-if get_option('guile').enabled()
+if not get_option('guile').disabled() and guile_dep.found()
+  config_h_data.set('BUILD_GUILE', 1)
+  config_h_data.set('GUILE_BINARY', '"guile"')
   subdir('guile')
 endif
 
@@ -192,3 +184,8 @@ if get_option('toys').enabled()
   subdir('toys/mug')
 endif
 ################################################################################
+
+################################################################################
+# write-out config.h
+configure_file(output : 'config.h', configuration : config_h_data)
+