[Spice-devel] [PATCHv2 win-agent 8/9] Use spice-protocol submodule

[Marc-André Lureau]

---
 .gitmodules    |    3 +++
 Makefile.am    |    2 +-
 autogen.sh     |   17 +++++++++++++++++
 configure.ac   |    1 -
 spice-protocol |    1 +
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 autogen.sh
 create mode 160000 spice-protocol

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f946a4d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "spice-protocol"]
+	path = spice-protocol
+	url = git://git.freedesktop.org/git/spice/spice-protocol.git
diff --git a/Makefile.am b/Makefile.am
index 05c4983..5afce17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES =
 
 INCLUDES =				\
 	-I$(top_srcdir)/common		\
-	$(SPICE_PROTOCOL_CFLAGS)	\
+	-I$(top_srcdir)/spice-protocol	\
 	$(NULL)
 
 AM_CPPFLAGS = -DUNICODE -D_UNICODE
diff --git a/autogen.sh b/autogen.sh
new file mode 100644
index 0000000..f84e1c1
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+pushd "$srcdir"
+git submodule update --init --recursive
+autoreconf -vfi
+popd
+
+if [ -z "$NOCONFIGURE" ]; then
+    "$srcdir"/configure --enable-maintainer-mode "$@"
+fi
+
+
diff --git a/configure.ac b/configure.ac
index 2888be3..597e724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,6 @@ dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol])
 PKG_CHECK_MODULES(CXIMAGE, [cximage])
 
 dnl ---------------------------------------------------------------------------
diff --git a/spice-protocol b/spice-protocol
new file mode 160000
index 0000000..d289047
--- /dev/null
+++ b/spice-protocol
@@ -0,0 +1 @@
+Subproject commit d28904731a06a25d3d148d895b0633520ead9aad
-- 
1.7.10.1