---
.gitmodules | 3 +++
Makefile.am | 1 +
autogen.sh | 3 +++
configure.ac | 4 +++-
spice-protocol | 1 +
5 files changed, 11 insertions(+), 1 deletions(-)
create mode 100644 .gitmodules
create mode 160000 spice-protocol
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 33bb25c..6c27750 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = common server python_modules
+DIST_SUBDIRS = spice-protocol $(SUBDIRS)
if SUPPORT_CLIENT
SUBDIRS += client
diff --git a/autogen.sh b/autogen.sh
index c5eefda..1c63a1b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,6 +8,9 @@ test -z "$srcdir" && srcdir=.
olddir=`pwd`
cd "$srcdir"
+git submodule init
+git submodule update
+
mkdir -p m4
autoreconf --verbose --force --install
diff --git a/configure.ac b/configure.ac
index b8acfa9..1ca5e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_PROG_LIBTOOL
AM_PROG_CC_C_O
AC_C_BIGENDIAN
AC_PATH_PROGS(PYTHON, python2 python)
+PKG_PROG_PKG_CONFIG
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([execinfo.h])
@@ -139,7 +140,8 @@ AM_CONDITIONAL(SUPPORT_AUTOMATED_TESTS, test
"x$enable_automated_tests" != "xno"
dnl =========================================================================
dnl Check deps
-PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.10.1)
+AC_CONFIG_SUBDIRS([spice-protocol])
+PROTOCOL_CFLAGS='-I ${top_srcdir}/spice-protocol'
AC_SUBST(PROTOCOL_CFLAGS)
AC_CHECK_LIBM
diff --git a/spice-protocol b/spice-protocol
new file mode 160000
index 0000000..d5edafd
--- /dev/null
+++ b/spice-protocol
@@ -0,0 +1 @@
+Subproject commit d5edafd28ab762b1b5f663aec449d3e3743f1184
--
1.7.7.6
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
