]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: fix setting of ENABLE_OOMD
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 27 Oct 2020 09:19:15 +0000 (10:19 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 27 Oct 2020 17:42:49 +0000 (18:42 +0100)
-Doomd=auto (the default) didn't work as intended because the initial correct
value was overwritten later by logic that didn't check for 'auto'.

meson.build

index e68b6d81c5cfe37232a4a2ebc246434a15904d0e..1abcac27f49f52666d0812dbcd57763dc51aaf1c 100644 (file)
@@ -1422,6 +1422,7 @@ else
         endif
 endif
 conf.set10('ENABLE_OOMD', have)
+substs.set10('ENABLE_OOMD', have)
 
 want_remote = get_option('remote')
 if want_remote != 'false'
@@ -1462,7 +1463,6 @@ foreach term : ['analyze',
                 'networkd',
                 'nss-myhostname',
                 'nss-systemd',
-                'oomd',
                 'portabled',
                 'pstore',
                 'quotacheck',