colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build,meson: Make use of _opt suffix for option variables

Browse Source 
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.
This commit is contained in:
Iñigo Martínez
2021-09-16 22:20:34 +02:00
committed by Aleksander Morgado
parent b3b16b3dc2
commit 7c4f8f6cc5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@@ -214,14 +214,14 @@ config_h.set('WITH_SYSTEMD_SUSPEND_RESUME', enable_systemd_suspend_resume)
config_h.set('WITH_SYSTEMD_JOURNAL', enable_systemd_journal) config_h.set('WITH_SYSTEMD_JOURNAL', enable_systemd_journal)
# PolicyKit # PolicyKit
polkit = get_option('polkit') polkit_opt = get_option('polkit')
enable_polkit = (polkit != 'no') enable_polkit = (polkit_opt != 'no')
if enable_polkit if enable_polkit
polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.97', not_found_message: 'PolicyKit development headers are required') 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]) 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 endif
config_h.set('WITH_POLKIT', enable_polkit) config_h.set('WITH_POLKIT', enable_polkit)
@@ -395,7 +395,7 @@ summary({
summary({ summary({
'udev': enable_udev, 'udev': enable_udev,
'policykit': polkit, 'policykit': polkit_opt,
'mbim': enable_mbim, 'mbim': enable_mbim,
'qmi': enable_qmi, 'qmi': enable_qmi,
'qrtr': enable_qrtr, 'qrtr': enable_qrtr,