summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson.build8
-rw-r--r--meson_options.txt2
2 files changed, 1 insertions, 9 deletions
diff --git a/meson.build b/meson.build
index 0af0cce8b8..e5d7c2710e 100644
--- a/meson.build
+++ b/meson.build
@@ -1450,14 +1450,6 @@ have = have and conf.get('HAVE_PAM') == 1
conf.set10('ENABLE_PAM_HOME', have)
have = get_option('oomd')
-if have == 'auto'
- have = get_option('mode') == 'developer'
-else
- have = have == 'true'
- if have and get_option('mode') != 'developer'
- warning('oomd is not ready for release mode (yet)')
- endif
-endif
conf.set10('ENABLE_OOMD', have)
substs.set10('ENABLE_OOMD', have)
diff --git a/meson_options.txt b/meson_options.txt
index a421473029..425e958ba2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -99,7 +99,7 @@ option('coredump', type : 'boolean',
description : 'install the coredump handler')
option('pstore', type : 'boolean',
description : 'install the pstore archival tool')
-option('oomd', type : 'combo', choices : ['auto', 'true', 'false'],
+option('oomd', type : 'boolean',
description : 'install the userspace oom killer')
option('logind', type : 'boolean',
description : 'install the systemd-logind stack')