summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoaquim Rocha <jrocha@endlessm.com>2018-07-24 16:44:53 +0200
committerJoaquim Rocha <jrocha@endlessm.com>2018-07-24 17:15:29 +0200
commitf3ea2b18819d6958c805ecbbe0b0d1e8e51b9194 (patch)
tree2eab95837e32421ca2e9f11dd62fc22f32f676a0
parentb8af3709dc0c79088517c335acbd9bdb7b402ead (diff)
downloadgnome-initial-setup-f3ea2b18819d6958c805ecbbe0b0d1e8e51b9194.tar.gz
build: Remove the "enable" prefix from Meson's options
This seems to be the recommended fashion in: https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
-rw-r--r--gnome-initial-setup/pages/meson.build2
-rw-r--r--meson.build10
-rw-r--r--meson_options.txt8
3 files changed, 10 insertions, 10 deletions
diff --git a/gnome-initial-setup/pages/meson.build b/gnome-initial-setup/pages/meson.build
index 9cc887f..7366385 100644
--- a/gnome-initial-setup/pages/meson.build
+++ b/gnome-initial-setup/pages/meson.build
@@ -12,7 +12,7 @@ pages = [
'software'
]
-if get_option('enable-region-page')
+if get_option('region-page')
pages += ['region']
endif
diff --git a/meson.build b/meson.build
index 1a4dd9d..afa9b81 100644
--- a/meson.build
+++ b/meson.build
@@ -28,27 +28,27 @@ conf.set_quoted('VENDOR_CONF_FILE', vendor_conf_file)
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('GNOMELOCALEDIR', locale_dir)
conf.set_quoted('PKGDATADIR', pkgdata_dir)
-conf.set('ENABLE_REGION_PAGE', get_option('enable-region-page'))
+conf.set('ENABLE_REGION_PAGE', get_option('region-page'))
# Needed for the 'account' page
cheese_dep = dependency ('cheese',
version: '>= 3.3.5',
- required: get_option('enable-cheese'))
+ required: get_option('cheese'))
cheese_gtk_dep = dependency ('cheese-gtk',
version: '>= 3.3.5',
- required: get_option('enable-cheese'))
+ required: get_option('cheese'))
conf.set('HAVE_CHEESE', cheese_dep.found() and cheese_gtk_dep.found())
# Needed for the 'software' page
pkgkit_dep = dependency ('packagekit-glib2',
version: '>= 1.1.4',
- required: get_option('enable-software-sources'))
+ required: get_option('software-sources'))
conf.set('ENABLE_SOFTWARE_SOURCES', pkgkit_dep.found())
# Needed for the 'keyboard' page
ibus_dep = dependency ('ibus-1.0',
version: '>= 1.4.99',
- required: get_option('enable-ibus'))
+ required: get_option('ibus'))
conf.set('HAVE_IBUS', ibus_dep.found())
configure_file(output: 'config.h',
diff --git a/meson_options.txt b/meson_options.txt
index de3beba..7502725 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,25 +3,25 @@ option('vendor-conf-file',
description: 'points to a keyfile containing vendor customization'
)
-option('enable-region-page',
+option('region-page',
description: 'builds and enables the region page',
type: 'boolean',
value: false
)
-option('enable-cheese',
+option('cheese',
description: 'enable support for Cheese',
type: 'feature',
value: 'auto'
)
-option('enable-software-sources',
+option('software-sources',
description: 'enable the Software Sources page',
type: 'feature',
value: 'auto'
)
-option('enable-ibus',
+option('ibus',
description: 'enable support for IBus',
type: 'feature',
value: 'auto'