diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-08-26 20:42:03 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-08-27 17:49:29 +0200 |
| commit | 1dd63580df2b6d6c8c08e43bd0ae7c2407611415 (patch) | |
| tree | 0a052a48f32824ffd4eb7b8e97ded1876b11ecb1 /meson_options.txt | |
| parent | 1a9bc22460c5bde4ba169b0cc4732971de309720 (diff) | |
| download | NetworkManager-1dd63580df2b6d6c8c08e43bd0ae7c2407611415.tar.gz | |
build/meson: fix build options for suspend-resume
suspend-resume must be selectable, out of for possible options.
We can do auto-detection based on present libraries, but it
shall be selectable. Like it is with autotools.
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt index 61304fcc04..25ec7ae4e9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,7 +15,7 @@ option('dnssec_trigger', type: 'array', value: ['dnssec-trigger-script', '/usr/l option('dist_version', type: 'string', value: '', description: 'Define the NM\'s distribution version string') option('session_tracking_consolekit', type: 'boolean', value: true, description: 'Support consolekit session tracking') option('session_tracking', type: 'combo', choices: ['systemd', 'elogind', 'no'], value: 'systemd', description: 'Compatibility option to choose one session tracking module') -option('suspend_resume', type: 'boolean', value: true, description: 'Build NetworkManager with specific suspend/resume support') +option('suspend_resume', type: 'combo', choices: ['upower', 'systemd', 'elogind', 'consolekit', 'auto'], value: 'auto', description: 'Build NetworkManager with specific suspend/resume support') option('polkit', type: 'combo', choices: ['yes', 'no', 'disabled'], value: 'yes', description: 'set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. \'disabled\' compiles NM without any support') option('modify_system', type: 'boolean', value: false, description: 'Allow users to modify system connections') option('polkit_agent', type: 'boolean', value: false, description: 'enable polkit agent for clients') |