[Spice-commits] 2 commits - configure.ac server/Makefile.am server/tests

[Christophe Fergau]

 configure.ac             |    3 +--
 server/Makefile.am       |    8 +-------
 server/tests/Makefile.am |    7 ++++++-
 3 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 1004748c46b0999d682601ca9e33c4e91be47a25
Author: Snir Sheriber <ssheribe at redhat.com>
Date:   Wed Jan 18 15:29:46 2017 +0200

    autotools: compile gst-test only if gstreamer is available
    
    Needed in order to avoid compilation error when gstreamer is
    unavailable

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index f696f9f..af0bd20 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -59,10 +59,13 @@ noinst_PROGRAMS =				\
 	test-vdagent				\
 	test-display-width-stride		\
 	spice-server-replay			\
-	test-gst				\
 	$(check_PROGRAMS)			\
 	$(NULL)
 
+if HAVE_GSTREAMER
+noinst_PROGRAMS += test-gst
+endif
+
 TESTS = $(check_PROGRAMS)			\
 	$(NULL)
 
@@ -109,6 +112,7 @@ libtest_stat4_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORK
 
 test_qxl_parsing_LDADD = ../libserver.la $(LDADD)
 
+if HAVE_GSTREAMER
 test_gst_SOURCES = test-gst.c \
 	$(NULL)
 test_gst_CPPFLAGS = \
@@ -116,3 +120,4 @@ test_gst_CPPFLAGS = \
 	$(GSTREAMER_0_10_CFLAGS)		\
 	$(GSTREAMER_1_0_CFLAGS)			\
 	$(NULL)
+endif
commit c9987b0fd59d5f19592851cb9bd7ddd1767dd996
Author: Snir Sheriber <ssheribe at redhat.com>
Date:   Thu Jan 19 16:29:18 2017 +0200

    autotools: Add automake conditional for gstreamer
    
    Adding conditional for having gstreamer_0_10 or gstreamer_1_0,
    removing the previous conditionals and update relevant ifdefs
    with the newly defined conditional

diff --git a/configure.ac b/configure.ac
index 8443114..f04585f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,6 @@ if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x0.10"; t
           fi
     ])
 fi
-AM_CONDITIONAL(HAVE_GSTREAMER_1_0, test "x$have_gstreamer_1_0" = "xyes")
 
 if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x1.0"; then
     SPICE_CHECK_GSTREAMER(GSTREAMER_0_10, 0.10, [gstreamer-0.10 gstreamer-base-0.10 gstreamer-app-0.10 gstreamer-video-0.10],
@@ -100,7 +99,7 @@ if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x1.0"; th
          fi
     ])
 fi
-AM_CONDITIONAL(HAVE_GSTREAMER_0_10, test "x$have_gstreamer_0_10" = "xyes")
+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer_0_10" = "xyes" || test "x$have_gstreamer_1_0" = "xyes")
 
 AS_IF([test "x$enable_gstreamer" = "xyes"],
       [AC_MSG_ERROR("GStreamer support requested but not found")],
diff --git a/server/Makefile.am b/server/Makefile.am
index 1442bf1..6db4e7b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -184,13 +184,7 @@ libserver_la_SOURCES +=	\
 	$(NULL)
 endif
 
-if HAVE_GSTREAMER_0_10
-libserver_la_SOURCES +=	\
-	gstreamer-encoder.c			\
-	$(NULL)
-endif
-
-if HAVE_GSTREAMER_1_0
+if HAVE_GSTREAMER
 libserver_la_SOURCES +=	\
 	gstreamer-encoder.c			\
 	$(NULL)