diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-04-26 17:10:15 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-03 15:10:57 +0100 |
| commit | 91dee46497241d75269d2742d761c913dcaea059 (patch) | |
| tree | 50df5b718e1c68510cfa03f0cac5a16faaa61bb5 /modules/input | |
| parent | 17518ef89bdc6af016c2f0811e5ba0f9c7cfcdca (diff) | |
| download | gtk+-91dee46497241d75269d2742d761c913dcaea059.tar.gz | |
build: Use get_pkgconfig_variable()
There's no need to run pkg-config ourselves.
Diffstat (limited to 'modules/input')
| -rw-r--r-- | modules/input/meson.build | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/modules/input/meson.build b/modules/input/meson.build index 43c3262165..0111790c73 100644 --- a/modules/input/meson.build +++ b/modules/input/meson.build @@ -8,21 +8,26 @@ build_dynamic_modules = false disable_modules = get_option('disable-modules') if not disable_modules - runcmd = run_command('pkg-config', '--variable=gmodule_supported', 'gmodule-no-export-2.0') - if runcmd.returncode() == 0 - gmodule_supported = runcmd.stdout().strip() - if gmodule_supported == 'true' - build_dynamic_modules = true - else - message('Modules are not supported according to gmodule-no-export-2.0.pc') - endif + gmodule_supported = dependency('gmodule-no-export-2.0').get_pkgconfig_variable('gmodule_supported') + if gmodule_supported == 'true' + build_dynamic_modules = true else - message('WARNING: failed to query if modules are supported!') + message('Modules are not supported according to gmodule-no-export-2.0.pc') endif endif -all_immodules = ['am-et', 'cedilla', 'cyrillic-translit', 'inuktitut', - 'ipa', 'multipress', 'thai', 'ti-er', 'ti-et', 'viqr'] +all_immodules = [ + 'am-et', + 'cedilla', + 'cyrillic-translit', + 'inuktitut', + 'ipa', + 'multipress', + 'thai', + 'ti-er', + 'ti-et', + 'viqr', +] all_immodules += backend_immodules |