From fb3fe2272cf6fa27642593f79b351802787319d4 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 8 Dec 2014 18:26:14 +0100 Subject: build-sys: Move smartcard check to m4 macro --- configure.ac | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 67e485e..27893cc 100644 --- a/configure.ac +++ b/configure.ac @@ -39,22 +39,9 @@ AC_SUBST(PROTOCOL_CFLAGS) PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7) AC_SUBST(PIXMAN_CFLAGS) -AC_ARG_ENABLE([smartcard], - AS_HELP_STRING([--enable-smartcard=@<:@yes/no/auto@:>@], - [Enable smartcard support @<:@default=auto@:>@]), - [], - [enable_smartcard="auto"]) - -have_smartcard=no -if test "x$enable_smartcard" != "xno"; then - PKG_CHECK_MODULES(SMARTCARD, libcacard >= 0.1.2, [have_smartcard=yes], [have_smartcard=no]) - 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" = "xyes"; then - AC_DEFINE(USE_SMARTCARD, [1], [Define if supporting smartcard proxying]) - fi -fi +SPICE_CHECK_SMARTCARD(SPICE_COMMON) +AC_SUBST(SPICE_COMMON_CFLAGS) +AC_SUBST(SPICE_COMMON_LIBS) AC_ARG_ENABLE(celt051, [ --disable-celt051 Disable celt051 audio codec (enabled by default)],, -- cgit