[Spice-devel] [PATCH 2/3] autotools: compile gst-test only if gstreamer is available

[Christophe Fergeau]

On Sun, Jan 15, 2017 at 06:12:21PM +0200, Snir Sheriber wrote:
> Needed in order to avoid compilation error when gstreamer is
> unavailable
> ---
>  server/tests/Makefile.am | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
> index f696f9f..55ace5b 100644
> --- a/server/tests/Makefile.am
> +++ b/server/tests/Makefile.am
> @@ -47,6 +47,10 @@ check_PROGRAMS =				\
>  	test-stat-file				\
>  	$(NULL)
>  
> +if HAVE_GSTREAMER
> +TEST_GST=test-gst
> +endif
> +
>  noinst_PROGRAMS =				\
>  	test-display-no-ssl			\
>  	test-display-streaming			\
> @@ -59,7 +63,7 @@ noinst_PROGRAMS =				\
>  	test-vdagent				\
>  	test-display-width-stride		\
>  	spice-server-replay			\
> -	test-gst				\
> +	$(TEST_GST)				\
>  	$(check_PROGRAMS)			\
>  	$(NULL)
>  
> @@ -109,6 +113,7 @@ libtest_stat4_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORK
>  
>  test_qxl_parsing_LDADD = ../libserver.la $(LDADD)
>  
> +if HAVE_GSTREAMER

Alternatively, it's probably possible to do
noinst_PROGRAMS += test-gst here to avoid the if HAVE_GSTREAMER block at
the very beginning of the file.
But I'm fine with your version

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170116/aa57f379/attachment.sig>