aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2021-09-16 22:20:34 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-10-14 07:57:55 +0000
commit7c4f8f6cc50054e1818c1f8e03cb2fa08218aa77 (patch)
tree452d29a7738af10337907836e3ec7fcba2a7b8a3
parentb3b16b3dc2608242a2e88d6b2870c403fb5a5d9c (diff)
build,meson: Make use of _opt suffix for option variables
To make option names consistent, an `_opt` suffix has been added. This was not applied to `polkit` option at the time and this is fixed now.
-rw-r--r--meson.build8
1 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index a5958f0c..260f17d9 100644
--- a/meson.build
+++ b/meson.build
@@ -214,14 +214,14 @@ config_h.set('WITH_SYSTEMD_SUSPEND_RESUME', enable_systemd_suspend_resume)
config_h.set('WITH_SYSTEMD_JOURNAL', enable_systemd_journal)
# PolicyKit
-polkit = get_option('polkit')
-enable_polkit = (polkit != 'no')
+polkit_opt = get_option('polkit')
+enable_polkit = (polkit_opt != 'no')
if enable_polkit
polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.97', not_found_message: 'PolicyKit development headers are required')
polkit_gobject_policydir = polkit_gobject_dep.get_pkgconfig_variable('policydir', define_variable: ['prefix', mm_prefix])
- policy_conf = {'MM_DEFAULT_USER_POLICY': (polkit == 'permissive' ? 'yes' : 'auth_self_keep')}
+ policy_conf = {'MM_DEFAULT_USER_POLICY': (polkit_opt == 'permissive' ? 'yes' : 'auth_self_keep')}
endif
config_h.set('WITH_POLKIT', enable_polkit)
@@ -395,7 +395,7 @@ summary({
summary({
'udev': enable_udev,
- 'policykit': polkit,
+ 'policykit': polkit_opt,
'mbim': enable_mbim,
'qmi': enable_qmi,
'qrtr': enable_qrtr,