diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-10-16 07:31:56 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-20 13:50:34 +0100 |
| commit | 4b32bbc8201730ab4dd5f56868caa0e9982444de (patch) | |
| tree | 891c9de1073b27f5910ac0fbda1b44df3f52f529 | |
| parent | 3db4d3acebc17ba29f303aaaa561271c94372249 (diff) | |
| download | NetworkManager-4b32bbc8201730ab4dd5f56868caa0e9982444de.tar.gz | |
build: meson: Remove polkit_dir option
meson is able to get variables defined in pkg-config files such as
directory paths. PolicyKit defines in its pkg-config file the path to
the directory where `policy` files are present.
This removes the `polkit_dir` option to ease the move to start using
those variables. The `polkit` variable has also been converted to
boolean.
Fedora spec script has also been updated accordingly.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index b7068bae37..b965ccc89c 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -530,7 +530,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. -Dovs=false \ %endif -Dselinux=true \ - -Dpolkit=yes \ + -Dpolkit=true \ -Dpolkit_agent=true \ -Dmodify_system=true \ -Dconcheck=true \ diff --git a/meson.build b/meson.build index 1b3d27ef0e..8055e31292 100644 --- a/meson.build +++ b/meson.build @@ -462,9 +462,7 @@ endif config_h.set10('WITH_JSON_VALIDATION', enable_json_validation) # polkit -polkit = get_option('polkit') -enable_polkit = (polkit != 'no') - +enable_polkit = get_option('polkit') if enable_polkit polkit_dir = get_option('polkit_dir') if polkit_dir == '' diff --git a/meson_options.txt b/meson_options.txt index 221ba2b804..631ca1c05f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,7 +16,7 @@ option('dist_version', type: 'string', value: '', description: 'Define the NM\'s 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: '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('polkit', type: 'boolean', value: true, description: 'User auth-polkit configuration option.') 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') option('selinux', type: 'boolean', value: true, description: 'Build with SELinux') |