[Spice-devel] [PATCH spice-common] Bump libcacard requirement to 2.5.1

[Christophe Fergeau]

On Tue, Jan 08, 2019 at 11:41:23AM +0400, marcandre.lureau at redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
> 
> v2.5.1 was released the 2015-11-24.

s/the/on/

> 
> According to repology, from the distro we care about, CentOS 6,
> openSUSE Leap 42.3 have too old version (0.1.2).
> 
> spice-gtk & spice-server will have to be updated to drop
> USE_SMARTCARD_012.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
> ---
>  m4/spice-deps.m4 | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
> index c8b0a0f..0281625 100644
> --- a/m4/spice-deps.m4
> +++ b/m4/spice-deps.m4
> @@ -87,14 +87,8 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [
>      have_smartcard=no
>      if test "x$enable_smartcard" != "xno"; then
>        PKG_CHECK_MODULES([SMARTCARD], [libcacard >= 2.5.1], [have_smartcard=yes], [have_smartcard=no])
> -      if test "x$have_smartcard" = "xno"; then
> -        PKG_CHECK_MODULES([SMARTCARD], [libcacard >= 0.1.2], [have_smartcard=yes have_smartcard_012=yes], [have_smartcard=no])
> -      fi
> -      if test "x$enable_smartcard" != "xauto" && test "x$have_smartcard" = "xno"; then
> -        AC_MSG_ERROR("Smartcard support requested but libcacard could not be found")
> -      fi
> -      if test "x$have_smartcard_012" = "xyes"; then
> -        AC_DEFINE(USE_SMARTCARD_012, [1], [Define if supporting smartcard proxying without libcacard.h])
> +      if test "x$enable_smartcard" = "xyes" && test "x$have_smartcard" = "xno"; then
> +        AC_MSG_ERROR([smarcard support explicitly requested, but some required packages are not available])

I think this will cause a change of behaviour if someone uses
--enable-smartcard=foo, before that patch the behaviour was the same as
--enable-smartcard, after that patch, the behaviour will be the same as
--enable-smartcard=auto.
I don't think it really matters though.

Reviewed-by: Christophe Fergeau <cfergeau at redhat.com>

>        fi
>        if test "x$have_smartcard" = "xyes"; then
>          AC_DEFINE(USE_SMARTCARD, [1], [Define if supporting smartcard proxying])
> -- 
> 2.20.1.2.gb21ebb671b
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20190108/ef96f79d/attachment.sig>