pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-30 17:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: Bump libcacard requirement to 2.5.1

Browse Source 
This had already been done for autotools in spice-common commit
924f47a653bd87fbd50229ee34b58d7b9a3f1ec8.

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:45 -02:00 committed by Frediano Ziglio
parent 8abeda90f8
commit afb2ec312b
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meson.build
View File

@ -172,20 +172,9 @@ if get_option('smartcard')
if smartcard_dep.found()
spice_server_deps += smartcard_dep
spice_server_config_data.set('USE_SMARTCARD', '1')
else
smartcard012_dep = dependency('libcacard', required : false, version : '>= 0.1.2')
if smartcard012_dep.found()
spice_server_deps += smartcard012_dep
spice_server_config_data.set('USE_SMARTCARD_012', '1')
endif
spice_server_has_smartcard = true
spice_server_requires += 'libcacard >= 2.5.1 '
endif
spice_server_has_smartcard = smartcard_dep.found() or smartcard012_dep.found()
if not spice_server_has_smartcard
error('Building with smartcard support but dependency not found')
endif
spice_server_requires += 'libcacard >= 0.1.2 '
endif
#

4
server/smartcard.c
View File

@ -20,13 +20,9 @@
#endif
#include <arpa/inet.h>
#ifdef USE_SMARTCARD_012
#include <vscard_common.h>
#else
#ifdef USE_SMARTCARD
#include <libcacard.h>
#endif
#endif
#include "reds.h"
#include "char-device.h"