build: Rename 'disable-modules' option

We should not have 'disable' in the name, to conform with the Meson best
practices for boolean options.
This commit is contained in:
Emmanuele Bassi 2018-02-14 13:35:38 +00:00
parent 970d2e3f45
commit 4b7017ef35
2 changed files with 4 additions and 4 deletions

View File

@ -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',

View File

@ -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