diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-01-08 11:40:02 +0400 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-01-08 13:12:55 +0400 |
commit | 924f47a653bd87fbd50229ee34b58d7b9a3f1ec8 (patch) | |
tree | 8c997a005555764935f3b3acd3812aa9f8cba926 | |
parent | 6dc745e877a12ed25634040dd6fa46fa5de694e2 (diff) |
Bump libcacard requirement to 2.5.1
v2.5.1 was released on 2015-11-24.
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@redhat.com>
Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
-rw-r--r-- | m4/spice-deps.m4 | 10 |
1 files 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]) fi if test "x$have_smartcard" = "xyes"; then AC_DEFINE(USE_SMARTCARD, [1], [Define if supporting smartcard proxying]) |