summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-12-10 10:01:24 +0100
committerThomas Haller <thaller@redhat.com>2019-12-11 13:13:05 +0100
commitd27fcd07541ae6f524115d5b0f36e14673135ca3 (patch)
tree9612ca9e2d9cd2e03a3eaee945334f55df2e0652 /contrib
parent2534be89a178f66bff6cef7a792eb4378c7d4ef5 (diff)
downloadNetworkManager-d27fcd07541ae6f524115d5b0f36e14673135ca3.tar.gz
build/meson: allow configuring default for main.auth-polkit setting
We always build PolicyKit support, because it merely depends on some D-Bus calls. However, there are two things to configure: - the default value for main.auth-polkit in NetworkManager.conf. This is now called "-Dconfig_auth_polkit_default=$VAL". - whether to install the policy file. This is called "-Dpolkit=$VAL". These settings are mostly independent, so add "config_auth_polkit_default" to make the default explicitly configurable. (cherry picked from commit c21c6bc0be2a4467402bc2d8718859dedb10b676)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index d4a802f74c..d7e3612dc4 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -585,6 +585,7 @@ This tool is still experimental.
%endif
-Dselinux=true \
-Dpolkit=true \
+ -Dconfig_auth_polkit_default=true \
-Dpolkit_agent=true \
-Dmodify_system=true \
-Dconcheck=true \