[geary/wip/misc-build-fixes: 1/2] Fix messaging menu dep so it actually gets found and built
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/misc-build-fixes: 1/2] Fix messaging menu dep so it actually gets found and built
- Date: Sat, 20 Apr 2019 05:06:58 +0000 (UTC)
commit 73e894cd72c16e95f33ff41c7da53d1e9749f635
Author: Michael Gratton <mike vee net>
Date: Fri Apr 19 13:19:07 2019 +1000
Fix messaging menu dep so it actually gets found and built
meson.build | 17 ++++++++++++++++-
src/client/meson.build | 2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 23162d87..dc5dd38a 100644
--- a/meson.build
+++ b/meson.build
@@ -105,9 +105,24 @@ 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)
+libmessagingmenu_dep = dependency('messaging-menu', version: '>= 12.10', required: false)
libunity = dependency('unity', version: '>= 5.12.0', required: false)
+if libmessagingmenu_dep.found()
+ # The libmessagingmenu dependency above determines if the lib is
+ # present, but since it uses a broken name for its VAPI we have to
+ # find that and the C libs separately.
+ libmessagingmenu = declare_dependency(
+ include_directories: include_directories(
+ libmessagingmenu_dep.get_pkgconfig_variable('includedir')
+ ),
+ dependencies: [
+ valac.find_library('MessagingMenu-1.0', dirs: [ '/usr/share/vala/vapi' ]),
+ cc.find_library('messaging-menu')
+ ],
+ )
+endif
+
# Ensure SQLite was built correctly
if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER', dependencies: sqlite)
error('SQLite3 is missing FTS3 tokenizer support. Please compile it with -DSQLITE_ENABLE_FTS3.\n'
diff --git a/src/client/meson.build b/src/client/meson.build
index 9f8d9eaf..2f15ee6b 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -136,7 +136,7 @@ geary_client_dependencies = [
geary_client_vala_options = geary_vala_options
-if libmessagingmenu.found()
+if libmessagingmenu_dep.found()
geary_client_dependencies += libmessagingmenu
geary_client_vala_options += ['-D', 'HAVE_LIBMESSAGINGMENU']
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]