build: Enable building Rygel without GStreamer

If no GStreamer is available, build Rygel without a media engine and all
Plugins that require GStreamer, such as:

* test
* gst-launch
* media-export
* playbin

2 files changed, 34 insertions, 34 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0f7095b6..65ca376a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ LDADD = $(LIBGUPNP_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
 	$(COVERAGE_LIBS)
 
-AM_VALAFLAGS = --disable-warnings --thread \
+AM_VALAFLAGS = --disable-warnings \
 	       --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
                --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gstreamer-base-0.10 \
                --pkg gio-2.0 --pkg gee-1.0 --pkg gstreamer-pbutils-0.10 \
@@ -42,10 +42,8 @@ check_PROGRAMS = rygel-http-item-uri-test \
 		 rygel-http-post-test \
 		 rygel-searchable-container-test \
 		 rygel-item-creator-test \
-		 rygel-playbin-renderer-test \
 		 rygel-user-config-test \
-		 rygel-regression \
-		 rygel-environment-test
+		 rygel-regression
 
 TESTS = $(check_PROGRAMS)
 
@@ -99,33 +97,6 @@ rygel_item_creator_test_SOURCES = rygel-item-creator-test.vala \
 				  rygel-search-expression.vala \
 				  rygel-media-engine.vala
 
-
-rygel_playbin_renderer_test_SOURCES = rygel-playbin-renderer-test.vala
-
-rygel_playbin_renderer_test_VALAFLAGS = \
-	$(AM_VALAFLAGS) \
-	--pkg rygel-renderer-gst-1.0 \
-	--pkg rygel-renderer-1.0 \
-	--pkg rygel-core-1.0 \
-	--vapidir $(top_builddir)/src/librygel-renderer \
-	--vapidir $(top_builddir)/src/librygel-renderer-gst \
-	--vapidir $(top_builddir)/src/librygel-core
-
-rygel_playbin_renderer_test_LDADD = \
-	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
-	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-1.0.la \
-	$(top_builddir)/src/librygel-core/librygel-core-1.0.la \
-	$(LDADD)
-
-rygel_playbin_renderer_test_CFLAGS = \
-	$(AM_CFLAGS) \
-	-I$(top_builddir)/src/librygel-renderer \
-	-I$(top_srcdir)/src/librygel-renderer \
-	-I$(top_builddir)/src/librygel-renderer-gst \
-	-I$(top_srcdir)/src/librygel-renderer-gst \
-	-I$(top_builddir)/src/librygel-core \
-	-I$(top_srcdir)/src/librygel-core
-
 rygel_user_config_test_SOURCES = rygel-configuration.vala \
 				 rygel-user-config.vala \
 				 rygel-user-config-test.vala
@@ -138,7 +109,6 @@ rygel_user_config_test_CFLAGS = \
 	$(AM_CFLAGS) \
 	-DSYS_CONFIG_DIR='"$(sysconfigdir)"'
 
-
 rygel_regression_SOURCES = \
 	rygel-regression.vala
 
@@ -161,10 +131,42 @@ rygel_regression_LDADD = \
 	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
 	$(top_builddir)/src/librygel-core/librygel-core-1.0.la
 
+if HAVE_GSTREAMER
+check_PROGRAMS += \
+	rygel-playbin-renderer-test \
+	rygel-environment-test
+
+rygel_playbin_renderer_test_SOURCES = rygel-playbin-renderer-test.vala
+
+rygel_playbin_renderer_test_VALAFLAGS = \
+	$(AM_VALAFLAGS) \
+	--pkg rygel-renderer-gst-1.0 \
+	--pkg rygel-renderer-1.0 \
+	--pkg rygel-core-1.0 \
+	--vapidir $(top_builddir)/src/librygel-renderer \
+	--vapidir $(top_builddir)/src/librygel-renderer-gst \
+	--vapidir $(top_builddir)/src/librygel-core
+
+rygel_playbin_renderer_test_LDADD = \
+	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
+	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-1.0.la \
+	$(top_builddir)/src/librygel-core/librygel-core-1.0.la \
+	$(LDADD)
+
+rygel_playbin_renderer_test_CFLAGS = \
+	$(AM_CFLAGS) \
+	-I$(top_builddir)/src/librygel-renderer \
+	-I$(top_srcdir)/src/librygel-renderer \
+	-I$(top_builddir)/src/librygel-renderer-gst \
+	-I$(top_srcdir)/src/librygel-renderer-gst \
+	-I$(top_builddir)/src/librygel-core \
+	-I$(top_srcdir)/src/librygel-core
+
 rygel_environment_test_SOURCES = rygel-environment-test.vala
 rygel_environment_test_CFLAGS = $(AM_CFLAGS)
 rygel_environment_test_LDADD = $(LDADD)
 rygel_environment_test_VALAFLAGS = $(AM_VALAFLAGS) --pkg gstreamer-0.10
+endif
 
 if ALWAYS_TEST
 all-local: check
diff --git a/tests/rygel-http-response-test.vala b/tests/rygel-http-response-test.vala
index 9f363840..d9e0c35c 100644
--- a/tests/rygel-http-response-test.vala
+++ b/tests/rygel-http-response-test.vala
@@ -49,8 +49,6 @@ public class Rygel.HTTPResponseTest : GLib.Object {
     private Error error;
 
     public static int main (string[] args) {
-        Gst.init (ref args);
-
         try {
             var test = new HTTPResponseTest.complete ();
             test.run ();