[Spice-commits] autogen.sh configure.ac .gitmodules Makefile.am spice-protocol

[Marc-André Lureau]

 .gitmodules    |    3 +++
 Makefile.am    |    2 ++
 autogen.sh     |    3 +++
 configure.ac   |   12 +++++++-----
 spice-protocol |    1 +
 5 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit a41f9bcd53a2db9c7144b1e8613b287b1117abdc
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Tue Feb 21 12:09:19 2012 +0100

    RFC: Use spice protocol as a submodule
    
    Spice protocol contains only headers. We would like to be able to use
    a protocol update without having to wait for the release, a git
    submodule works well for this purpose.

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f7de75d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "spice-protocol"]
+	path = spice-protocol
+	url = ../spice-protocol
diff --git a/Makefile.am b/Makefile.am
index 8136550..73b5531 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
 NULL =
 
 SUBDIRS = common gtk po python_modules doc data
+DIST_SUBDIRS = spice-protocol vapi $(SUBDIRS)
+
 if HAVE_INTROSPECTION
 if WITH_VALA
 SUBDIRS += vapi
diff --git a/autogen.sh b/autogen.sh
index 2724d7e..f36bb6f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,9 @@ set -e # exit on errors
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+git submodule init
+git submodule update
+
 gtkdocize
 autoreconf -v --force --install
 intltoolize -f
diff --git a/configure.ac b/configure.ac
index 7876378..7332b6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,14 +59,16 @@ AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
 AC_CHECK_HEADERS([sys/ipc.h sys/shm.h])
 AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h])
 
-dnl =========================================================================
-dnl Chek optional features
-PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.10.2)
-AC_SUBST(PROTOCOL_CFLAGS)
-
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
+AC_CONFIG_SUBDIRS([spice-protocol])
+PROTOCOL_CFLAGS='-I ${top_srcdir}/spice-protocol'
+AC_SUBST(PROTOCOL_CFLAGS)
+
+dnl =========================================================================
+dnl Chek optional features
+
 srcdir="$(dirname $0)"
 if test ! -e "$srcdir/gtk/generated_marshallers.c"; then
   AC_MSG_CHECKING([for pyparsing python module])
diff --git a/spice-protocol b/spice-protocol
new file mode 160000
index 0000000..cda8862
--- /dev/null
+++ b/spice-protocol
@@ -0,0 +1 @@
+Subproject commit cda88623d0754aeeda005ddc048dd113d279845b