meson: shorten code a bit

diff --git a/meson.build b/meson.build
index ec7729436063bc69078a4425c5ac201024cbb06b..5e26f7a7e7c6c24c6d367439e3b5f8789d6b2b1e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1842,9 +1842,6 @@ else
 endif
 conf.set10('ENABLE_IMPORTD', have)
 
-want_kernel_install = get_option('kernel-install')
-conf.set10('ENABLE_KERNEL_INSTALL', want_kernel_install)
-
 want_homed = get_option('homed')
 if want_homed != 'false'
         have = (conf.get('HAVE_OPENSSL') == 1 and
@@ -1861,9 +1858,6 @@ conf.set10('ENABLE_HOMED', have)
 have = have and conf.get('HAVE_PAM') == 1
 conf.set10('ENABLE_PAM_HOME', have)
 
-have = get_option('oomd')
-conf.set10('ENABLE_OOMD', have)
-
 want_remote = get_option('remote')
 if want_remote != 'false'
         have_deps = [conf.get('HAVE_MICROHTTPD') == 1,
@@ -1896,6 +1890,7 @@ foreach term : ['analyze',
                 'idn',
                 'ima',
                 'initrd',
+                'kernel-install',
                 'ldconfig',
                 'localed',
                 'logind',
@@ -1904,6 +1899,7 @@ foreach term : ['analyze',
                 'nscd',
                 'nss-myhostname',
                 'nss-systemd',
+                'oomd',
                 'portabled',
                 'pstore',
                 'quotacheck',

diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index 6d568966d61f0fcbfa1501733a8618a810261d60..29a3d2c5f6030424cfbe898e8a3b4631d8be8cc8 100644 (file)
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+want_kernel_install = conf.get('ENABLE_KERNEL_INSTALL') == 1
+
 ukify_install = custom_target(
         '60-ukify.install',
         input : '60-ukify.install.in',