[Spice-devel] [spice-server] build-sys: Adjust to new spice-common spice-deps.m4

[Eduardo Lima (Etrunko)]

On 10/23/2015 10:19 AM, Christophe Fergeau wrote:
> This commit also updates the spice-common submodule
> 
> Christophe Fergeau (7):
>       Add marshaller test case
>       build-sys: Use ${PKG_CONFIG} rather than pkg-config
>       build-sys: Rework SPICE_CHECK_* m4 macros
>       build-sys: Add gio-2.0 to SPICE_CHECK_GLIB2
>       build-sys: Fix error in SPICE_CHECK_LZ4 description
>       build-sys: Set automake conditional in SPICE_CHECK_SMARTCARD
>       build-sys: Rename SUPPORT_GL to HAVE_GL
> 
> Javier Celaya (1):
>       Fix linearization of several marshallers with one item
> 
> Lukas Venhoda (3):
>       ssl-verify: Only check addr length when using IP addr
>       m4: Require glib version >= 2.22
>       ssl-verify: Changed IPv4 hostname to IPv6

Is the message correct for this commit? Or it is some leftover from
other patch series?


> ---
>  configure.ac       | 7 +++----
>  server/Makefile.am | 4 ++--
>  spice-common       | 2 +-
>  3 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 283bdb8..dfb967b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -72,14 +72,13 @@ esac
>  
>  dnl =========================================================================
>  dnl Check optional features
> -SPICE_CHECK_OPENGL([GL])
> +SPICE_CHECK_OPENGL
>  AS_IF([test x"$enable_opengl" != "xno"], [
>        AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $GL_LIBS"])
>  ])
>  
>  
> -SPICE_CHECK_SMARTCARD([SMARTCARD])
> -AM_CONDITIONAL(SUPPORT_SMARTCARD, test "x$have_smartcard" = "xyes")
> +SPICE_CHECK_SMARTCARD
>  
>  AC_ARG_ENABLE([automated_tests],
>                AS_HELP_STRING([--enable-automated-tests], [Enable automated tests using spicy-screenshot (part of spice--gtk)]),,
> @@ -87,7 +86,7 @@ AC_ARG_ENABLE([automated_tests],
>  AS_IF([test x"$enable_automated_tests" != "xno"], [enable_automated_tests="yes"])
>  AM_CONDITIONAL(SUPPORT_AUTOMATED_TESTS, test "x$enable_automated_tests" != "xno")
>  
> -SPICE_CHECK_LZ4([LZ4])
> +SPICE_CHECK_LZ4
>  
>  dnl =========================================================================
>  dnl Check deps
> diff --git a/server/Makefile.am b/server/Makefile.am
> index cd4686a..826659e 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -130,14 +130,14 @@ libspice_server_la_SOURCES =			\
>  	pixmap-cache.c				\
>  	$(NULL)
>  
> -if SUPPORT_GL
> +if HAVE_GL
>  libspice_server_la_SOURCES +=	\
>  	reds_gl_canvas.c	\
>  	reds_gl_canvas.h	\
>  	$(NULL)
>  endif
>  
> -if SUPPORT_SMARTCARD
> +if HAVE_SMARTCARD
>  libspice_server_la_SOURCES +=	\
>  	smartcard.c		\
>  	smartcard.h		\
> diff --git a/spice-common b/spice-common
> index 449c5da..d8c3568 160000
> --- a/spice-common
> +++ b/spice-common
> @@ -1 +1 @@
> -Subproject commit 449c5da90f6ab65a49139eb6c70be6004eb4ee31
> +Subproject commit d8c3568a3160aa3dfcd1d3b7728360c33d2d6911
> 


-- 
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etrunko at redhat.com