diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-08-14 11:20:05 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-08-20 12:30:55 +0100 |
| commit | 5acc0176380b74546259690f5562a9404f1dec4f (patch) | |
| tree | 4e5332564fc858f3c5e0187ce5f94cbebea7a0d2 | |
| parent | bdeef8b292ab2e3edea8e8ab9683d56d59d29953 (diff) | |
build-sys: Remove spice-protocol submodule
It's seeing regular releases and is API stable, so we don't need to
bundle it with spice-server
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | server/Makefile.am | 1 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 1 | ||||
| m--------- | spice-common | 0 |
4 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5b4caa4..5048c41 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ dnl ========================================================================= dnl Check deps AC_CONFIG_SUBDIRS([spice-common]) -COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/' +COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/' AC_SUBST(COMMON_CFLAGS) AC_CHECK_LIBM @@ -109,6 +109,9 @@ AS_IF([test x"$have_smartcard" = "xyes"], [ AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 0.1.2"]) ]) +PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.10]) +AS_VAR_APPEND([SPICE_REQUIRES], [" spice-protocol >= 0.12.10"]) + PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.22]) AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= 2.22"]) diff --git a/server/Makefile.am b/server/Makefile.am index 89a375c..6137249 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ $(SASL_CFLAGS) \ $(SLIRP_CFLAGS) \ $(SMARTCARD_CFLAGS) \ + $(SPICE_PROTOCOL_CFLAGS) \ $(SSL_CFLAGS) \ $(VISIBILITY_HIDDEN_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index 32c97ce..8b08d1c 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ $(GLIB2_CFLAGS) \ $(SMARTCARD_CFLAGS) \ $(SPICE_NONPKGCONFIG_CFLAGS) \ + $(SPICE_PROTOCOL_CFLAGS) \ $(NULL) if SUPPORT_AUTOMATED_TESTS diff --git a/spice-common b/spice-common -Subproject 53f7f543f9edd57ed16fed2e46452024c880dfa +Subproject 7665dcf1bb2fa0b16b3d0015b28d7f5912664c3 |