[Spice-devel] [spice-server PATCH v1] build-sys: remove -I spice-protocol as submodule

[Victor Toso]

---
 configure.ac             | 6 +++++-
 server/Makefile.am       | 1 +
 server/tests/Makefile.am | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5b4caa4..2479822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,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
@@ -109,6 +109,10 @@ AS_IF([test x"$have_smartcard" = "xyes"], [
     AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 0.1.2"])
 ])
 
+PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12])
+AC_SUBST(SPICE_PROTOCOL_CFLAGS)
+AS_VAR_APPEND([SPICE_REQUIRES], [" spice-protocol >= 0.12"])
+
 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 89a375c..efc3159 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS =					\
 	-DSPICE_SERVER_INTERNAL			\
 	-DRED_STATISTICS			\
 	$(COMMON_CFLAGS)			\
+	$(SPICE_PROTOCOL_CFLAGS)		\
 	$(GLIB2_CFLAGS)				\
 	$(LZ4_CFLAGS)				\
 	$(PIXMAN_CFLAGS)			\
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 32c97ce..f147a44 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS =					\
 	-I$(top_builddir)/server		\
 	-I$(top_srcdir)/server/tests		\
 	$(COMMON_CFLAGS)			\
+	$(SPICE_PROTOCOL_CFLAGS)		\
 	$(GLIB2_CFLAGS)				\
 	$(SMARTCARD_CFLAGS)			\
 	$(SPICE_NONPKGCONFIG_CFLAGS)		\
-- 
2.4.3