1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 56c7ca99dcadbf3e80ff2a9baf3e174f278b6a71 Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <sobhan@gentoo.org>
Date: Wed, 19 Jun 2019 01:16:16 -0400
Subject: [PATCH] optinal vala
---
libgeoclue/meson.build | 5 +++--
meson_options.txt | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build
index e228ec3..e78a3e8 100644
--- a/libgeoclue/meson.build
+++ b/libgeoclue/meson.build
@@ -58,7 +58,8 @@ libgeoclue_dep = declare_dependency(link_with: libgeoclue,
sources: [ libgeoclue_sources, libgeoclue_headers ])
gir = find_program('g-ir-scanner', required: false)
-vapigen = find_program('vapigen', required: false)
+vapigen_req = get_option('vapigen')
+vapigen = find_program('vapigen-ver', required: false)
enable_gir = get_option('introspection')
pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0']
gir_sources = [ libgeoclue_sources,
@@ -78,7 +79,7 @@ if gir.found() and enable_gir
install: true,
header: 'geoclue.h',
extra_args: [ '--quiet' ])
- if vapigen.found()
+ if vapigen.found() and vapigen_req
gnome.generate_vapi('libgeoclue-' + gclue_api_version,
sources: geo_gir[0],
packages: pkg_requirements,
diff --git a/meson_options.txt b/meson_options.txt
index 83bc60e..8611f6c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,6 @@
+option('vapigen',
+ type: 'boolean', value: false,
+ description: 'Enable vala?')
option('libgeoclue',
type: 'boolean', value: true,
description: 'Enable convenience library')
--
2.21.0
|
GitWeb
