[Spice-devel] [PATCH] build-sys: Remove spice-protocol submodule

[Victor Toso]

Hey,

On Fri, Aug 07, 2015 at 12:48:05PM +0200, Christophe Fergeau wrote:
> It's seeing regular releases and is API stable, so we don't need to
> bundle it with spice-server
> ---
>  configure.ac                       | 5 ++++-
>  server/Makefile.am                 | 1 +
>  server/tests/Makefile.am           | 1 +
>  server/tests/test_spice_version.sh | 2 +-
>  4 files changed, 7 insertions(+), 2 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/server/tests/test_spice_version.sh b/server/tests/test_spice_version.sh
> index 5e5b173..bfcba5b 100755
> --- a/server/tests/test_spice_version.sh
> +++ b/server/tests/test_spice_version.sh
> @@ -1,7 +1,7 @@
>  #!/bin/bash
>  
>  ROOT=$(dirname $0)/../../
> -INCLUDE="-I$ROOT -I$ROOT/spice-common/spice-protocol/"
> +INCLUDE="-I$ROOT $(pkg-config --cflags spice-protocol)"
>  TEMP=`mktemp -d`
>  
>  cat > $TEMP/check_version.c <<EOF
> -- 
> 2.4.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel

Ack