diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-10-12 15:48:26 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-10-23 13:34:22 +0200 |
| commit | d4091f0df4474cff3972d8488520f8705362a4bb (patch) | |
| tree | 9e52846ba5e89d36f1c40a5ce92a9eb7151cd796 | |
| parent | 51e5400d48efe24526c368e95689d085aa5cc959 (diff) | |
| download | spice-gtk-d4091f0df4474cff3972d8488520f8705362a4bb.tar.gz spice-gtk-d4091f0df4474cff3972d8488520f8705362a4bb.tar.xz spice-gtk-d4091f0df4474cff3972d8488520f8705362a4bb.zip | |
Adjust to spice-common spice-deps.m4 changes
This commit updates spice-common to latest git master.
Since the argument to the SPICE_CHECK_xxx macros is now unused, it's
cleaner to remove it.
Christophe Fergeau (3):
Add marshaller test case
build-sys: Use ${PKG_CONFIG} rather than pkg-config
build-sys: Rework SPICE_CHECK_* m4 macros
Frediano Ziglio (1):
common: Fix typo in comment
Javier Celaya (1):
Fix linearization of several marshallers with one item
| -rw-r--r-- | configure.ac | 4 | ||||
| m--------- | spice-common | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 577f9a9..22248a6 100644 --- a/configure.ac +++ b/configure.ac @@ -355,7 +355,7 @@ AC_SUBST(JPEG_LIBS) AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found])) AC_SUBST(Z_LIBS) -SPICE_CHECK_SMARTCARD([SMARTCARD]) +SPICE_CHECK_SMARTCARD AM_CONDITIONAL([WITH_SMARTCARD], [test "x$have_smartcard" = "xyes"]) AC_ARG_ENABLE([usbredir], @@ -680,7 +680,7 @@ if test "x$enable_dbus" != "xno"; then fi fi -SPICE_CHECK_LZ4([LZ4]) +SPICE_CHECK_LZ4 dnl =========================================================================== dnl check compiler flags diff --git a/spice-common b/spice-common -Subproject dd63a3b656bd11af7d97317f2de0824cd6cef5d +Subproject f7ec855af3deff18aeb43ddbf2467c565f4bf34 |