[Spice-commits] common/Makefile.am configure.ac

[GitLab Mirror]

 common/Makefile.am |    2 --
 configure.ac       |    7 -------
 2 files changed, 9 deletions(-)

New commits:
commit f97c9c3900addf90f830b5966addf2b5b922cbee
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Thu May 17 11:04:16 2018 -0300

    build: Remove FIXME_SERVER_SMARTCARD hack
    
    This hack is now made obsolete by the previous commit. We can safely
    remove those defines and the code now builds fine for both spice server
    and spice-gtk.
    
    commit df4ec5c3186e796624e4bbf2dc4a269faf2823f6
    Author: Frediano Ziglio <fziglio at redhat.com>
    Date:   Fri May 11 16:59:46 2018 +0100
    
        Fix generation of Smartcard channel
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/common/Makefile.am b/common/Makefile.am
index 22aec80..ea15039 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -78,8 +78,6 @@ libspice_common_server_la_SOURCES =		\
 	$(SERVER_MARSHALLERS)			\
 	$(NULL)
 
-libspice_common_server_la_CFLAGS = -DFIXME_SERVER_SMARTCARD
-
 AM_CPPFLAGS =				\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
diff --git a/configure.ac b/configure.ac
index 3da85de..39faf1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,11 +64,4 @@ AC_CONFIG_FILES([
   docs/Makefile
 ])
 
-AH_BOTTOM([
-/* argh.. this is evil */
-#if defined(FIXME_SERVER_SMARTCARD) && defined(USE_SMARTCARD)
-%:undef USE_SMARTCARD
-#endif
-])
-
 AC_OUTPUT