diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| m--------- | spice-protocol | 0 |
5 files changed, 10 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..f7de75dd --- /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 33bb25cf..6c277506 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 @@ -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 b8acfa94..1ca5e774 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 +Subproject d5edafd28ab762b1b5f663aec449d3e3743f118 |