diff options
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 43cf7bf2bb..7940a70c00 100644 --- a/meson.build +++ b/meson.build @@ -1412,7 +1412,15 @@ 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' +have = get_option('oomd') +if have == 'auto' + have = get_option('mode') == 'developer' +else + have = have == 'true' + if have and get_option('mode') != 'developer' + error('oomd is not available in release mode (yet)') + endif +endif conf.set10('ENABLE_OOMD', have) want_remote = get_option('remote') diff --git a/meson_options.txt b/meson_options.txt index a6a0c1e4b8..59248c7099 100644 --- 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', value : 'false', +option('oomd', type : 'combo', choices : ['auto', 'true', 'false'], description : 'install the userspace oom killer') option('logind', type : 'boolean', description : 'install the systemd-logind stack') |