diff --git a/configure.ac b/configure.ac
index 283bdb86..dfb967b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,14 +72,13 @@ esac
 
 dnl =========================================================================
 dnl Check optional features
-SPICE_CHECK_OPENGL([GL])
+SPICE_CHECK_OPENGL
 AS_IF([test x"$enable_opengl" != "xno"], [
       AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $GL_LIBS"])
 ])
 
 
-SPICE_CHECK_SMARTCARD([SMARTCARD])
-AM_CONDITIONAL(SUPPORT_SMARTCARD, test "x$have_smartcard" = "xyes")
+SPICE_CHECK_SMARTCARD
 
 AC_ARG_ENABLE([automated_tests],
               AS_HELP_STRING([--enable-automated-tests], [Enable automated tests using spicy-screenshot (part of spice--gtk)]),,
@@ -87,7 +86,7 @@ AC_ARG_ENABLE([automated_tests],
 AS_IF([test x"$enable_automated_tests" != "xno"], [enable_automated_tests="yes"])
 AM_CONDITIONAL(SUPPORT_AUTOMATED_TESTS, test "x$enable_automated_tests" != "xno")
 
-SPICE_CHECK_LZ4([LZ4])
+SPICE_CHECK_LZ4
 
 dnl =========================================================================
 dnl Check deps
diff --git a/server/Makefile.am b/server/Makefile.am
index fad1cbce..5c4874bf 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -130,14 +130,14 @@ libspice_server_la_SOURCES =			\
 	spice_image_cache.c			\
 	$(NULL)
 
-if SUPPORT_GL
+if HAVE_GL
 libspice_server_la_SOURCES +=	\
 	reds_gl_canvas.c	\
 	reds_gl_canvas.h	\
 	$(NULL)
 endif
 
-if SUPPORT_SMARTCARD
+if HAVE_SMARTCARD
 libspice_server_la_SOURCES +=	\
 	smartcard.c		\
 	smartcard.h		\
diff --git a/spice-common b/spice-common
index 449c5da9..d8c3568a 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 449c5da90f6ab65a49139eb6c70be6004eb4ee31
+Subproject commit d8c3568a3160aa3dfcd1d3b7728360c33d2d6911