From 2c201c2140f9a75f3698e988880f00f8d0492315 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 27 Apr 2017 21:13:08 -0400 Subject: meson: use booleans for conf.set and drop unecessary conditionals Using conf.set() with a boolean argument does the right thing: either #ifdef or #undef. This means that conf.set can be used unconditionally. Previously I used '1' as the placeholder value, and that needs to be changed to 'true' for consistency (under meson 1 cannot be used in boolean context). All checks need to be adjusted. --- src/locale/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/locale') diff --git a/src/locale/meson.build b/src/locale/meson.build index d03af4c0e2..d7dd113c8d 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -6,7 +6,7 @@ systemd_localed_sources = files(''' localectl_sources = files('localectl.c') -if conf.get('ENABLE_LOCALED', 0) == 1 +if conf.get('ENABLE_LOCALED', false) install_data('org.freedesktop.locale1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.locale1.service', @@ -27,7 +27,7 @@ endif kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map') language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map') -if conf.get('ENABLE_LOCALED', 0) == 1 +if conf.get('ENABLE_LOCALED', false) install_data('kbd-model-map', 'language-fallback-map', install_dir : pkgdatadir) -- cgit v1.2.3-54-g00ecf