meson: disable systemd-oomd by default

systemd-oomd can be enabled when in developer mode (-Dmode=developer)

diff --git a/meson.build b/meson.build
index 435c0bbc98e6e9d76f5539b1311551050dd4c9ed..91cbf09de71de7c73e7b2904bc04d84e3f8b63aa 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1410,6 +1410,9 @@ conf.set10('ENABLE_HOMED', have)
 have = have and conf.get('HAVE_PAM') == 1
 conf.set10('ENABLE_PAM_HOME', have)
 
+have = get_option('oomd') and get_option('mode') == 'developer'
+conf.set10('ENABLE_OOMD', have)
+
 want_remote = get_option('remote')
 if want_remote != 'false'
         have_deps = [conf.get('HAVE_MICROHTTPD') == 1,

diff --git a/meson_options.txt b/meson_options.txt
index b789e4d77f29d66afbfb7a1a5aee0556cb785740..a6a0c1e4b88c8adf2072ffb2f810e183542b9257 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -97,7 +97,7 @@ option('coredump', type : 'boolean',
        description : 'install the coredump handler')
 option('pstore', type : 'boolean',
        description : 'install the pstore archival tool')
-option('oomd', type : 'boolean',
+option('oomd', type : 'boolean', value : 'false',
        description : 'install the userspace oom killer')
 option('logind', type : 'boolean',
        description : 'install the systemd-logind stack')