Commit 9b533a4d authored by Michael Gratton's avatar Michael Gratton 🤞

Use meson's standard approach to finding the messaging-menu library

Fixes FTB on master.
parent 3fd89c5a
Pipeline #63154 failed with stages
in 19 minutes and 55 seconds
......@@ -103,8 +103,8 @@ endif
# Optional dependencies
appstream_util = find_program('appstream-util', required: false)
desktop_file_validate = find_program('desktop-file-validate', required: false)
libmessagingmenu = dependency('libmessaging-menu', version: '>= 12.10', required: false)
libunity = dependency('unity', version: '>= 5.12.0', required: false)
libmessagingmenu = meson.get_compiler('c').find_library('libmessaging-menu', required: false)
# Ensure SQLite was built correctly
if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER', dependencies: sqlite)
......
......@@ -130,13 +130,7 @@ geary_client_dependencies = [
geary_client_vala_options = geary_vala_options
if libmessagingmenu.found()
messagingmenu_vapi = meson.get_compiler('vala').find_library(
'MessagingMenu-1.0',
dirs: '/usr/share/vala/vapi',
required: true
)
geary_client_dependencies += libmessagingmenu
geary_client_dependencies += messagingmenu_vapi
geary_client_vala_options += ['-D', 'HAVE_LIBMESSAGINGMENU']
endif
if libunity.found()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment