[Spice-devel] [spice-gtk 1/2] build-sys: Remove spice-protocol submodule

[Victor Toso]

Hi,

On Fri, Aug 07, 2015 at 12:49:22PM +0200, Christophe Fergeau wrote:
> It's seeing regular releases and is API stable, so we don't need to
> bundle it with spice-gtk
> ---
>  configure.ac | 8 +++++---
>  spice-common | 2 +-
>  2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 1b347c0..855069f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -73,7 +73,9 @@ AC_CHECK_LIBM
>  AC_SUBST(LIBM)
>
>  AC_CONFIG_SUBDIRS([spice-common])
> -COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/'
> +PKG_CHECK_MODULES([PROTOCOL], [spice-protocol >= 0.12.10])
> +

I would go with SPICE_PROTOCOL just to be consistent with spice server
as well [0] but feel free to ignore this ;)
[0] http://lists.freedesktop.org/archives/spice-devel/2015-August/021516.html

> +COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ ${PROTOCOL_CFLAGS}'
>  AC_SUBST(COMMON_CFLAGS)
>
>  SPICE_GTK_MAJOR_VERSION=`echo $PACKAGE_VERSION | cut -d. -f1`
> @@ -99,7 +101,7 @@ if test ! -e "$srcdir/src/vncdisplaykeymap_osx2xtkbd.c"; then
>    AC_MSG_RESULT([found])
>  fi
>
> -SPICE_GLIB_REQUIRES=""
> +SPICE_GLIB_REQUIRES="spice-protocol >= 0.12.10"
>  SPICE_GTK_REQUIRES=""
>
>  PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
> @@ -700,7 +702,7 @@ SPICE_CFLAGS="$SPICE_CFLAGS $WARN_CFLAGS"
>
>  AC_SUBST(SPICE_CFLAGS)
>
> -SPICE_GLIB_CFLAGS="$PROTOCOL_CFLAGS $PIXMAN_CFLAGS $PULSE_CFLAGS $GST_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS $SASL_CFLAGS"
> +SPICE_GLIB_CFLAGS="$PIXMAN_CFLAGS $PULSE_CFLAGS $GST_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS $SASL_CFLAGS"
>  SPICE_GTK_CFLAGS="$SPICE_GLIB_CFLAGS $GTK_CFLAGS "

Yep, looks good.

>
>  AC_SUBST(SPICE_GLIB_CFLAGS)
> diff --git a/spice-common b/spice-common
> index 2d054e0..c64265a 160000
> --- a/spice-common
> +++ b/spice-common
> @@ -1 +1 @@
> -Subproject commit 2d054e0e6901a1cfbe396f30d9899da46ff533d9
> +Subproject commit c64265a046b4ceb84134b13a3088520a1d08df9a
> -- 
> 2.4.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel