[rygel/wip/gst-1.0: 1/2] wip: Switch engine arguments

[Jens Georg <jensgeorg src gnome org>]

commit f266d0b9d45aea7287a5954c9ac630cc8f7e9ea0
Author: Jens Georg <jensg openismus com>
Date:   Sat Nov 3 15:50:58 2012 +0100

    wip: Switch engine arguments

 configure.ac |   48 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 37 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0457848..2566073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,14 +65,35 @@ PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4 >= $LIBSOUP_REQUIRED)
 dnl Media engine to use
 BUILT_ENGINES="librygel-media-engine-simple"
 
-AC_ARG_WITH([media_engine],
-            AS_HELP_STRING(
-                [--with-media-engine=@<:@gstreamer|none@:>@],
-                [Media Engine to use]),
-            [with_media_engine="$withval"],
-            [with_media_engine="gstreamer"])
-
-AS_IF([test "x$with_media_engine" = "xgstreamer"],
+AC_ARG_ENABLE([media_engine_gst_0.10],
+              AS_HELP_STRING(
+                [--enable-media-engine-gst-0.10],
+                [Compile with GStreamer 0.10 media engine]),
+              [enable_media_engine_gst_0_10="$enableval"],
+              [enable_media_engine_gst_0_10="yes"])
+
+dnl AC_ARG_ENABLE([media_engine_gst_1.0],
+dnl               AS_HELP_STRING(
+dnl                 [--enable-media-engine-gst-1.0],
+dnl                 [Compile with GStreamer 1.0 media engine]),
+dnl               [enable_media_engine_gst_1_0="$enableval"],
+dnl               [enable_media_engine_gst_1_0="yes"])
+
+AC_ARG_ENABLE([media_engine_simple],
+              AS_HELP_STRING(
+                [--enable-media-engine-simple],
+                [Compile with simple media engine]),
+              [enable_media_engine_simple="$enableval"],
+              [enable_media_engine_simple="yes"])
+
+dnl AC_ARG_WITH([media_engine],
+dnl             AS_HELP_STRING(
+dnl                 [--with-media-engine=@<:@gstreamer|none@:>@],
+dnl                 [Media Engine to use]),
+dnl             [with_media_engine="$withval"],
+dnl             [with_media_engine="gstreamer"])
+
+AS_IF([test "x$enable_media_engine_gst_0_10" = "xyes"],
       [
         PKG_CHECK_MODULES(LIBGUPNP_DLNA, gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED)
         PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
@@ -91,7 +112,7 @@ RYGEL_ADD_PLUGIN([mpris],[MPRIS2 DBus consumer],[yes])
 RYGEL_ADD_PLUGIN([mediathek],[ZDF Mediathek],[no])
 RYGEL_ADD_PLUGIN([tracker],[Tracker],[yes])
 
-AS_IF([test "x$with_media_engine" = "xgstreamer"],
+AS_IF([test "x$enable_gstreamer" = "xyes"],
       [
         RYGEL_ADD_PLUGIN([playbin],[GStreamer playbin],[yes])
         RYGEL_ADD_PLUGIN([media-export],[MediaExport],[yes])
@@ -126,7 +147,7 @@ RYGEL_CHECK_VALA([$VALA_REQUIRED],
                   gee-1.0
                   posix])
 
-AS_IF([test "x$with_media_engine" = "xgstreamer"],
+AS_IF([test "x$enable_gstreamer" = "xyes"],
       [
         RYGEL_CHECK_PACKAGES([gupnp-dlna-1.0 gstreamer-0.10 gstreamer-pbutils-0.10])
       ])
@@ -329,7 +350,12 @@ echo "
         VALAFLAGS:              ${VALAFLAGS}
         uninstalled:            ${enable_uninstalled}
         preferences ui:         ${HAVE_GTK}
-        Media Engine:           ${with_media_engine}
+
+    Media Engines:
+        Simple                  ${enable_media_engine_simple}
+        GStreamer 0.10          ${enable_media_engine_gst_0_10}
+        GStreamer 1.0           ${enable_media_engine_gst_1_0}
+
     Plugins:
         examples:               ${enable_example_plugins}
         test:                   ${enable_test_plugin}