It's seeing regular releases and is API stable, so we don't need to
bundle it with spice-gtk
---
configure.ac | 9 ++++++++-
doc/reference/Makefile.am | 2 +-
gtk/Makefile.am | 1 +
gtk/controller/Makefile.am | 1 +
spice-common | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index b55f3a0..b6fd445 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT([disable-static win32-dll])
AM_MAINTAINER_MODE
+# For autoconf < 2.63
+m4_ifndef([AS_VAR_APPEND],
+ AC_DEFUN([AS_VAR_APPEND], $1=$$1$2))
+
IT_PROG_INTLTOOL([0.40.0])
GETTEXT_PACKAGE=spice-gtk
AC_SUBST(GETTEXT_PACKAGE)
@@ -72,7 +76,7 @@ AC_CHECK_LIBM
AC_SUBST(LIBM)
AC_CONFIG_SUBDIRS([spice-common])
-COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/'
+COMMON_CFLAGS='-I ${top_srcdir}/spice-common/'
AC_SUBST(COMMON_CFLAGS)
SPICE_GTK_MAJOR_VERSION=`echo $PACKAGE_VERSION | cut -d. -f1`
@@ -101,6 +105,9 @@ fi
SPICE_GLIB_REQUIRES=""
SPICE_GTK_REQUIRES=""
+PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.7])
+AS_VAR_APPEND([SPICE_GLIB_REQUIRES], [" spice-protocol >= 0.12.7"])
+
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
AC_SUBST(PIXMAN_CFLAGS)
AC_SUBST(PIXMAN_LIBS)
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 76c7d34..4ac1f93 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -54,7 +54,7 @@ IGNORE_HFILES= \
$(NULL)
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gtk -I$(top_builddir)/gtk $(SPICE_GLIB_CFLAGS) $(SPICE_GTK_CFLAGS) $(COMMON_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gtk -I$(top_builddir)/gtk $(SPICE_GLIB_CFLAGS) $(SPICE_GTK_CFLAGS) $(COMMON_CFLAGS) $(SPICE_PROTOCOL_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/gtk/libspice-client-glib-2.0.la $(top_builddir)/gtk/libspice-client-gtk-$(SPICE_GTK_API_VERSION).la
include $(top_srcdir)/gtk-doc.make
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6003793..9a76eef 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -96,6 +96,7 @@ SPICE_COMMON_CPPFLAGS = \
$(SASL_CFLAGS) \
$(GST_CFLAGS) \
$(SMARTCARD_CFLAGS) \
+ $(SPICE_PROTOCOL_CFLAGS) \
$(USBREDIR_CFLAGS) \
$(GUDEV_CFLAGS) \
$(SOUP_CFLAGS) \
diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 00552e8..e2aad41 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GSpiceController\" \
$(GIO_CFLAGS) \
$(COMMON_CFLAGS) \
+ $(SPICE_PROTOCOL_CFLAGS) \
$(NULL)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
diff --git a/spice-common b/spice-common
index 5b3cdad..ce0d0d6 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 5b3cdad921d32c9294377efac61243a09f849d08
+Subproject commit ce0d0d60bf483334484a42c139c66781d370e791
--
2.1.0
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel