[Spice-devel] [PATCH] build-sys: Remove spice-protocol submodule

[Christophe Fergeau]

It's seeing regular releases and is API stable, so we don't need to
bundle it with spice-server
---
 configure.ac                       | 5 ++++-
 server/Makefile.am                 | 1 +
 server/tests/Makefile.am           | 1 +
 server/tests/test_spice_version.sh | 2 +-
 spice-common                       | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4e57ef3..334d611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ dnl =========================================================================
 dnl Check deps
 
 AC_CONFIG_SUBDIRS([spice-common])
-COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/'
+COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/'
 AC_SUBST(COMMON_CFLAGS)
 
 AC_CHECK_LIBM
@@ -138,6 +138,9 @@ if test "x$enable_smartcard" = "xyes"; then
 fi
 
 
+PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.7])
+AS_VAR_APPEND([SPICE_REQUIRES], [" spice-protocol >= 0.12.7"])
+
 PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.22])
 AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= 2.22"])
 
diff --git a/server/Makefile.am b/server/Makefile.am
index 3cef243..9d25f57 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS =					\
 	$(SASL_CFLAGS)				\
 	$(SLIRP_CFLAGS)				\
 	$(SMARTCARD_CFLAGS)			\
+	$(SPICE_PROTOCOL_CFLAGS)		\
 	$(SSL_CFLAGS)				\
 	$(VISIBILITY_HIDDEN_CFLAGS)		\
 	$(WARN_CFLAGS)				\
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 3a52d5c..4467bcf 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS =					\
 	$(GLIB2_CFLAGS)				\
 	$(SMARTCARD_CFLAGS)			\
 	$(SPICE_NONPKGCONFIG_CFLAGS)		\
+	$(SPICE_PROTOCOL_CFLAGS)		\
 	$(NULL)
 
 if SUPPORT_AUTOMATED_TESTS
diff --git a/server/tests/test_spice_version.sh b/server/tests/test_spice_version.sh
index 5e5b173..bfcba5b 100755
--- a/server/tests/test_spice_version.sh
+++ b/server/tests/test_spice_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ROOT=$(dirname $0)/../../
-INCLUDE="-I$ROOT -I$ROOT/spice-common/spice-protocol/"
+INCLUDE="-I$ROOT $(pkg-config --cflags spice-protocol)"
 TEMP=`mktemp -d`
 
 cat > $TEMP/check_version.c <<EOF
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