[Spice-commits] common/messages.h meson.build

[GitLab Mirror]

 common/messages.h |    4 ----
 meson.build       |    6 ------
 2 files changed, 10 deletions(-)

New commits:
commit 413da761ec38903533da2b63024f6fd0665b4a80
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Sat Feb 2 10:41:18 2019 -0200

    meson: Bump libcacard requirement to 2.5.1
    
    Commit 924f47 did this for autotools, do the same for meson.
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/common/messages.h b/common/messages.h
index 2399b08..3e37235 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -34,13 +34,9 @@
 #include <spice/protocol.h>
 #include <spice/macros.h>
 
-#ifdef USE_SMARTCARD_012
-#include <vscard_common.h>
-#else
 #ifdef USE_SMARTCARD
 #include <libcacard.h>
 #endif
-#endif
 
 #include "draw.h"
 
diff --git a/meson.build b/meson.build
index e26d817..512811e 100644
--- a/meson.build
+++ b/meson.build
@@ -152,12 +152,6 @@ if get_option('smartcard')
   if smartcard_dep.found()
     spice_common_deps += smartcard_dep
     spice_common_config_data.set('USE_SMARTCARD', '1')
-  else
-    smartcard012_dep = dependency('libcacard', required : false, version : '>= 0.1.2')
-    if smartcard012_dep.found()
-      spice_common_deps += smartcard012_dep
-      spice_common_config_data.set('USE_SMARTCARD_012', '1')
-    endif
   endif
 endif