[Spice-commits] 2 commits - configure.ac spice-common

[Christophe Fergau]

 configure.ac |   32 +++-----------------------------
 spice-common |    2 +-
 2 files changed, 4 insertions(+), 30 deletions(-)

New commits:
commit e379c340b724aa4a53be0915b9d7818bfc6fe751
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Jun 17 19:26:56 2015 +0200

    build-sys: Use SPICE_CHECK_LZ4
    
    spice-common now has an m4 macro adding a --enable-lz4 option and
    doing the needed checks, so we can use it in configure.ac rather than
    duplicating it here.

diff --git a/configure.ac b/configure.ac
index 5732c95..d1234c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -677,18 +677,7 @@ if test "x$enable_dbus" != "xno"; then
   fi
 fi
 
-AC_ARG_ENABLE([lz4],
-  AS_HELP_STRING([--enable-lz4=@<:@yes/no@:>@],
-                 [Enable lz4 compression algorithm @<:@default=no@:>@]),
-  [],
-  [enable_lz4="no"])
-
-if test "x$enable_lz4" = "xyes"; then
-    PKG_CHECK_MODULES(LZ4, liblz4)
-    AC_DEFINE([USE_LZ4], [1], [Define to build with Lz4 support])
-fi
-AC_SUBST(LZ4_CFLAGS)
-AC_SUBST(LZ4_LIBS)
+SPICE_CHECK_LZ4([LZ4])
 
 dnl ===========================================================================
 dnl check compiler flags
diff --git a/spice-common b/spice-common
index fec8031..1b5edbe 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit fec803156b1844a2deb705cf55933294ca60a5ea
+Subproject commit 1b5edbe49e5c36c4f35453de448b54f770e1c1be
commit e1dfac38bdae1adeb601f9c5582ad0afef566aa2
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Jun 18 11:51:09 2015 +0200

    build-sys: Use SPICE_CHECK_SMARTCARD
    
    spice-common has an m4 macro adding a --enable-smartcard option and
    doing the needed checks, so we can use it in configure.ac rather than
    duplicating it here.

diff --git a/configure.ac b/configure.ac
index 4b0af64..5732c95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.57])
 AC_INIT([spice-gtk], [m4_esyscmd(build-aux/git-version-gen .tarball-version)],
         [spice-devel at lists.freedesktop.org])
 
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4 spice-common/m4])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -352,22 +352,7 @@ AC_SUBST(JPEG_LIBS)
 AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found]))
 AC_SUBST(Z_LIBS)
 
-AC_ARG_ENABLE([smartcard],
-  AS_HELP_STRING([--enable-smartcard=@<:@auto/yes/no@:>@],
-                 [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([SMARTCARD])
 AM_CONDITIONAL([WITH_SMARTCARD], [test "x$have_smartcard" = "xyes"])
 
 AC_ARG_ENABLE([usbredir],