pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-10 06:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: switch smartcard option to auto feature

Browse Source 
Make it compatible with spice-common.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Eduardo Lima (Etrunko) 2019-02-13 14:44:46 -02:00 committed by Frediano Ziglio
parent afb2ec312b
commit a8737c5740
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@ -167,14 +167,12 @@ endif
# smartcard check
spice_server_has_smartcard = false
if get_option('smartcard')
smartcard_dep = dependency('libcacard', required : false, version : '>= 2.5.1')
if smartcard_dep.found()
spice_server_deps += smartcard_dep
spice_server_config_data.set('USE_SMARTCARD', '1')
spice_server_has_smartcard = true
spice_server_requires += 'libcacard >= 2.5.1 '
endif
smartcard_dep = dependency('libcacard', required : get_option('smartcard'), version : '>= 2.5.1')
if smartcard_dep.found()
spice_server_deps += smartcard_dep
spice_server_config_data.set('USE_SMARTCARD', '1')
spice_server_has_smartcard = true
spice_server_requires += 'libcacard >= 2.5.1 '
endif
#

3
meson_options.txt
View File

@ -22,8 +22,7 @@ option('opus',
description: 'Enable Opus audio codec')
option('smartcard',
type : 'boolean',
value : true,
type : 'feature',
description : 'Enable smartcard support')
option('alignment-checks',

2
subprojects/spice-common

@ -1 +1 @@
Subproject commit 2e914f3305f685c82143fa04067ce9f57fbfd602
Subproject commit 02530a80dfa45c936215c47b8e3aa56720eb46b8