From 4b7017ef357686e8d1d7d6525174b18979a8bd16 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 14 Feb 2018 13:35:38 +0000 Subject: [PATCH] build: Rename 'disable-modules' option We should not have 'disable' in the name, to conform with the Meson best practices for boolean options. --- meson_options.txt | 4 ++-- modules/input/meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 5d98ba5242..42283abdd2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,8 +24,8 @@ option('enable-cloudproviders', type: 'boolean', value: false, description : 'Enable the cloudproviders support') option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', description : 'Enable support for the Xinerama extension') -option('disable-modules', type: 'boolean', value : 'false', - description : 'Disable dynamic module loading') +option('dynamic-modules', type: 'boolean', value : true, + description : 'Allow dynamic module loading') option('with-included-immodules', type: 'string', value : '', description : 'Build the specified input methods into gtk (comma-separated list or "all" or "none")') option('documentation', type: 'boolean', value: 'false', diff --git a/modules/input/meson.build b/modules/input/meson.build index 0111790c73..72171582db 100644 --- a/modules/input/meson.build +++ b/modules/input/meson.build @@ -6,8 +6,8 @@ # there is a bit of an ordering problem which we solve by collecting all the # information here but moving the actual build definitions to gtk/meson.build. build_dynamic_modules = false -disable_modules = get_option('disable-modules') -if not disable_modules +dynamic_modules = get_option('dynamic-modules') +if dynamic_modules gmodule_supported = dependency('gmodule-no-export-2.0').get_pkgconfig_variable('gmodule_supported') if gmodule_supported == 'true' build_dynamic_modules = true