>
> This had already been done for autotools in spice-common commit
> 924f47a653bd87fbd50229ee34b58d7b9a3f1ec8.
>
> Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx>
> ---
> meson.build | 15 ++-------------
> server/smartcard.c | 4 ----
> 2 files changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 5f402a5f..f6580fc2 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -173,20 +173,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 '
It does not seem the same. In the previous case an error
was reported if smartcard dependencies were not found.
Now it silently continues.
> endif
>
> #
> diff --git a/server/smartcard.c b/server/smartcard.c
> index 4c849450..7a152ed2 100644
> --- a/server/smartcard.c
> +++ b/server/smartcard.c
> @@ -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"
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel