From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 27 Oct 2020 09:19:15 +0000 (+0100)
Subject: meson: fix setting of ENABLE_OOMD
X-Git-Tag: v247-rc2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a881d9618337440b948728f33093511feba21212;p=thirdparty%2Fsystemd.git

meson: fix setting of ENABLE_OOMD

-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'.
---

diff --git a/meson.build b/meson.build
index e68b6d81c5c..1abcac27f49 100644
--- a/meson.build
+++ b/meson.build
@@ -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',