diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-02-24 09:16:44 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-02-24 15:14:29 +0100 |
| commit | c39d440e423ce2606e920fafe3d1f660f6942bf3 (patch) | |
| tree | 7f4844590386efc7f16f0787091f5817eceac9c2 | |
| parent | 2e6edd64c473d1c0cdb45eaea151c83d367e9a49 (diff) | |
build: use spice-protocol as a submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| m--------- | spice-protocol | 0 |
5 files changed, 9 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..14b3beb --- /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 b811df8..934f055 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = SpiceXPI data +DIST_SUBDIRS = spice-protocol $(SUBDIRS) EXTRA_DIST = \ m4 @@ -6,6 +6,9 @@ test -z "$srcdir" && srcdir=. mkdir -p "$srcdir"/m4 +git submodule init +git submodule update + autoreconf -vfi "$srcdir" if [ -z "$NOCONFIGURE" ]; then diff --git a/configure.ac b/configure.ac index eefb354..4c0f201 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,8 @@ PKG_CHECK_MODULES(LOG4CPP, log4cpp) AC_SUBST(LOG4CPP_CFLAGS) AC_SUBST(LOG4CPP_LIBS) -PKG_CHECK_MODULES(SPICE_PROTOCOL, spice-protocol >= 0.10.2) +AC_CONFIG_SUBDIRS([spice-protocol]) +SPICE_PROTOCOL_CFLAGS='-I ${top_srcdir}/spice-protocol' AC_SUBST(SPICE_PROTOCOL_CFLAGS) # The explicit nspr dep is needed because libxul-embedding diff --git a/spice-protocol b/spice-protocol new file mode 160000 +Subproject d5edafd28ab762b1b5f663aec449d3e3743f118 |