summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2019-02-04 00:41:05 +0000
committerDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2019-02-04 00:41:05 +0000
commit31faca1234ebb9b23c997d9ffebaa757a1f3e214 (patch)
tree2b85b405b11c276549618d6bb60cf21d293fa628
parent7ff7c513941cf389c59ee4dd102cf93cf2ea2a4a (diff)
parent8c13a452560b564af18ba9aae0ba97caffad8e2c (diff)
downloaddconf-31faca1234ebb9b23c997d9ffebaa757a1f3e214.tar.gz
Merge branch 'optional-vapi' into 'master'
build: Make dconf client vapi installation optional See merge request GNOME/dconf!40
-rw-r--r--bin/meson.build2
-rw-r--r--client/meson.build25
-rw-r--r--meson.build3
-rw-r--r--meson_options.txt1
4 files changed, 22 insertions, 9 deletions
diff --git a/bin/meson.build b/bin/meson.build
index ceafa82..e2c620a 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -1,4 +1,4 @@
-sources = gvdb_builder + libdconf_vapi + files(
+sources = gvdb_builder + files(
'dconf.c',
)
diff --git a/client/meson.build b/client/meson.build
index 74fb090..f3b7122 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -56,11 +56,24 @@ pkg.generate(
variables: 'exec_prefix=${prefix}',
)
-libdconf_vapi = files('dconf.vapi')
+if get_option('vapi')
+ vapigen_dep = dependency('vapigen')
+
+ vapi_data = files(
+ 'dconf.vapi',
+ 'dconf.deps',
+ )
+
+ vapi_dir = vapigen_dep.get_pkgconfig_variable(
+ 'vapidir',
+ define_variable: ['datadir', dconf_datadir]
+ )
+
+ install_data(
+ vapi_data,
+ install_dir: vapi_dir,
+ )
+endif
+
-vapi_data = libdconf_vapi + files('dconf.deps')
-install_data(
- vapi_data,
- install_dir: vapi_dir,
-)
diff --git a/meson.build b/meson.build
index 85bcc02..0204a18 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
'dconf', ['c'],
version: '0.31.2',
license: 'LGPL2.1+',
- meson_version: '>= 0.46.0',
+ meson_version: '>= 0.47.0',
)
dconf_prefix = get_option('prefix')
@@ -47,7 +47,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.44.0')
gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir])
dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir])
-vapi_dir = dependency('vapigen').get_pkgconfig_variable('vapidir', define_variable: ['datadir', dconf_datadir])
enable_bash_completion = get_option('bash_completion')
if enable_bash_completion
diff --git a/meson_options.txt b/meson_options.txt
index 9c8e3e6..a2794ce 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files')
option('man', type: 'boolean', value: true, description: 'generate man pages')
option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+option('vapi', type: 'boolean', value: true, description: 'install dconf client vapi')