alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson.build: tweak guile build

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2025-05-31 12:37:13 +03:00
parent c9b5755d68
commit 154a68d948
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meson.build
View File

@ -210,9 +210,9 @@ host_system = host_machine.system()
# soft dependencies # soft dependencies
# #
#
# logging # logging
#
# if we're on a linux machine, perhaps there's systemd/journald. # if we're on a linux machine, perhaps there's systemd/journald.
# otherwise, we don't bother. # otherwise, we don't bother.
if host_machine.system() == 'linux' if host_machine.system() == 'linux'
@ -222,7 +222,9 @@ if cc.has_function('g_log_writer_syslog',dependencies: glib_dep)
config_h_data.set('MAYBE_USE_SYSLOG', 1) config_h_data.set('MAYBE_USE_SYSLOG', 1)
endif endif
# optionally, use Compact Language Detector2 if we can find it. #
# use Compact Language Detector2 if we can find it
#
cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: get_option('cld2')) cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: get_option('cld2'))
if not get_option('cld2').disabled() and cld2_dep.found() if not get_option('cld2').disabled() and cld2_dep.found()
config_h_data.set('HAVE_CLD2', 1) config_h_data.set('HAVE_CLD2', 1)
@ -230,7 +232,9 @@ else
message('CLD2 not found or disabled; no support for language detection') message('CLD2 not found or disabled; no support for language detection')
endif endif
#
# guile # guile
guile_dep = dependency('guile-3.0', required: get_option('guile')) guile_dep = dependency('guile-3.0', required: get_option('guile'))
# allow for a custom guile-extension-dir # allow for a custom guile-extension-dir
if guile_dep.found() if guile_dep.found()
@ -291,6 +295,15 @@ install_data('NEWS.org', 'IDEAS.org',
################################################################################ ################################################################################
# subdirs # subdirs
subdir('lib') subdir('lib')
# this must happen _after_ subdir('lib')
if not get_option('guile').disabled() and guile_dep.found()
config_h_data.set('BUILD_GUILE', 1)
config_h_data.set_quoted('GUILE_BINARY',
guile_dep.get_variable(pkgconfig: 'guile'))
subdir('guile')
endif
subdir('mu') subdir('mu')
# emacs -- needed for mu4e compilation # emacs -- needed for mu4e compilation
@ -302,15 +315,7 @@ if emacs.found()
subdir('man') subdir('man')
subdir('mu4e') subdir('mu4e')
else else
message('emacs not found; not pre-compiling mu4e / generating manpages') message('emacs not found; not pre-compiling mu4e / generating man-pages')
endif
if not get_option('guile').disabled() and guile_dep.found()
config_h_data.set('BUILD_GUILE', 1)
config_h_data.set_quoted('GUILE_BINARY',
guile_dep.get_variable(pkgconfig: 'guile'))
#message('guile is disabled for now')
subdir('guile')
endif endif
config_h_data.set_quoted('MU_PROGRAM', mu.full_path()) config_h_data.set_quoted('MU_PROGRAM', mu.full_path())