[rygel] Change --with-media-engine=none to =simple

[Murray Cumming <murrayc src gnome org>]

commit db42c372d6e82d8de61b3967a6229cffd69a2d02
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Dec 5 10:30:10 2012 +0100

    Change --with-media-engine=none to =simple

 README                                          |    4 ++++
 configure.ac                                    |    5 ++++-
 doc/reference/librygel-renderer-gst/Makefile.am |    1 -
 doc/reference/librygel-renderer/Makefile.am     |    1 -
 examples/renderer-plugins/vala/Makefile.am      |    2 --
 examples/server-plugins/vala/Makefile.am        |    2 --
 6 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/README b/README
index deddeac..f8260fb 100644
--- a/README
+++ b/README
@@ -68,6 +68,10 @@ Requirements
       * gst-ffmpeg
       * gst-plugins-bad
       * gst-plugins-ugly
+      
+To build without gstreamer, use:
+  --with-media-engine=simple
+This will also disable any plugins that use gstreamer.
 
 References
 ==========
diff --git a/configure.ac b/configure.ac
index d8946df..a03f4f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ LT_PREREQ([2.2.6])
 LT_INIT([dlopen disable-static])
 
 dnl Required versions of library packages
+dnl Not all of these are actually used, depending on the configure options.
 GLIB_REQUIRED=2.31.13
 LIBXML_REQUIRED=2.7
 VALA_REQUIRED=0.18.0
@@ -67,9 +68,11 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED)
 dnl Media engine to use
 BUILT_ENGINES="librygel-media-engine-simple"
 
+dnl Disabling the gstreamer media_engine also disables
+dnl anything else that uses gstreamer.
 AC_ARG_WITH([media_engine],
             AS_HELP_STRING(
-                [--with-media-engine=@<:@gstreamer|none@:>@],
+                [--with-media-engine=@<:@gstreamer|simple@:>@],
                 [Media Engine to use]),
             [with_media_engine="$withval"],
             [with_media_engine="gstreamer"])
diff --git a/doc/reference/librygel-renderer-gst/Makefile.am b/doc/reference/librygel-renderer-gst/Makefile.am
index 84c15e9..b353c47 100644
--- a/doc/reference/librygel-renderer-gst/Makefile.am
+++ b/doc/reference/librygel-renderer-gst/Makefile.am
@@ -14,7 +14,6 @@ VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-renderer-g
 #	echo $(VALA_SOURCE_FILES_WITH_PATHS);
 
 # TODO: The need for rygel-build-config here reminds us that we shouldn't need that in librygel-renderer-gst either.
-# TODO: Why is gstreamer-pbutils-0.10 needed here, but not needed in librygel-renderer-gst/Makefile.am?
 RYGEL_DOCBUILD_VALADOC_FLAGS = \
 		--vapidir $(top_srcdir)/src/librygel-core \
 		--pkg rygel-core-2.0 \
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index 8cd4faf..129b3b7 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -11,7 +11,6 @@ VALA_SOURCE_FILES = $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
 VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-renderer/, $(VALA_SOURCE_FILES))
 
 # TODO: The need for rygel-build-config here reminds us that we shouldn't need that in librygel-renderer either.
-# TODO: Why is gstreamer-pbutils-0.10 needed here, but not needed in librygel-renderer/Makefile.am?
 RYGEL_DOCBUILD_VALADOC_FLAGS = \
 	--vapidir $(top_srcdir)/src/librygel-core \
 	--pkg rygel-core-2.0 \
diff --git a/examples/renderer-plugins/vala/Makefile.am b/examples/renderer-plugins/vala/Makefile.am
index 33e829c..1a2a77c 100644
--- a/examples/renderer-plugins/vala/Makefile.am
+++ b/examples/renderer-plugins/vala/Makefile.am
@@ -9,11 +9,9 @@ librygel_example_renderer_plugin_vala_la_SOURCES = \
 	example-player-vala.vala
 
 librygel_example_renderer_plugin_vala_la_VALAFLAGS = \
-	--pkg gstreamer-0.10 \
 	$(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
 
 librygel_example_renderer_plugin_vala_la_LIBADD = \
-	$(LIBGSTREAMER_LIBS) \
 	$(RYGEL_COMMON_RENDERER_LIBS)
 	
 librygel_example_renderer_plugin_vala_la_LDFLAGS = \
diff --git a/examples/server-plugins/vala/Makefile.am b/examples/server-plugins/vala/Makefile.am
index 4260f85..2001ac4 100644
--- a/examples/server-plugins/vala/Makefile.am
+++ b/examples/server-plugins/vala/Makefile.am
@@ -12,11 +12,9 @@ librygel_example_server_plugin_vala_la_SOURCES = \
 	example-root-container-vala.vala
 
 librygel_example_server_plugin_vala_la_VALAFLAGS = \
-	--pkg gstreamer-0.10 \
 	$(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
 
 librygel_example_server_plugin_vala_la_LIBADD = \
-	$(LIBGSTREAMER_LIBS) \
 	$(RYGEL_COMMON_SERVER_LIBS)
 	
 librygel_example_server_plugin_vala_la_LDFLAGS = \