[tracker/gstreamer-with-dlna-0.10: 5/12] build: rename --enable-video-extractor to --enable-generic-media-extractor

[Carlos Garnacho <carlosg src gnome org>]

commit 331bfc1bbd399d15ea5db4374911d1983da05d50
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Jul 12 16:18:16 2011 +0200

    build: rename --enable-video-extractor to --enable-generic-media-extractor
    
    We really use gstreamer and such as a generic media extractor, not just for
    video files, so this configure switch name makes more sense.
    
    Fixes GB#654441.

 configure.ac                    |   74 +++++++++++++++++++-------------------
 src/tracker-extract/Makefile.am |    2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 369c3e9..c281b1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1537,10 +1537,10 @@ AM_CONDITIONAL(HAVE_GDKPIXBUF, test "x$have_gdkpixbuf" = "xyes")
 # Check for tracker-extract: gstreamer/xine/totem/mplayer/etc
 ####################################################################
 
-AC_ARG_ENABLE(video-extractor,
-              AS_HELP_STRING([--enable-video-extractor=ARG],
-                             [enables one of the (gupnp-dlna, gstreamer, xine, external, auto) video extractor backends [[default=auto]]]),,
-              [enable_video_extractor=auto])
+AC_ARG_ENABLE(generic-media-extractor,
+              AS_HELP_STRING([--enable-generic-media-extractor=ARG],
+                             [enables one of the (gupnp-dlna, gstreamer, xine, external, auto) generic media extractor backends [[default=auto]]]),,
+              [enable_generic_media_extractor=auto])
 
 PKG_CHECK_MODULES(GUPNP_DLNA,
                   [gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED],
@@ -1567,73 +1567,73 @@ PKG_CHECK_MODULES(XINE,
 AC_SUBST(XINE_CFLAGS)
 AC_SUBST(XINE_LIBS)
 
-if test "x$enable_video_extractor" = "xauto"; then
+if test "x$enable_generic_media_extractor" = "xauto"; then
    if test "$have_libgstreamer" = "yes"; then
-      have_video_handler="yes"
+      have_generic_media_handler="yes"
       if test "$have_gupnp_dlna" = "yes"; then
-         have_video_handler_app="GStreamer GUPnP-DLNA"
+         have_generic_media_handler_app="GStreamer GUPnP-DLNA"
       else
-         have_video_handler_app="GStreamer"
+         have_generic_media_handler_app="GStreamer"
       fi
    elif test "$have_libxine" = "yes"; then
-      have_video_handler_app="Xine"
-      have_video_handler="yes"
+      have_generic_media_handler_app="Xine"
+      have_generic_media_handler="yes"
    else
-      have_video_handler="?"
-      have_video_handler_app="An external video player will be called"
+      have_generic_media_handler="?"
+      have_generic_media_handler_app="An external generic_media player will be called"
    fi
-elif test "x$enable_video_extractor" = "xgupnp-dlna"; then
+elif test "x$enable_generic_media_extractor" = "xgupnp-dlna"; then
    if test "$have_gupnp_dlna" = "yes"; then
       if test "$have_libgstreamer" = "yes"; then
-         have_video_handler_app="GStreamer GUPnP-DLNA"
-         have_video_handler="yes"
+         have_generic_media_handler_app="GStreamer GUPnP-DLNA"
+         have_generic_media_handler="yes"
       else
          AC_MSG_ERROR([Couldn't find GStreamer >= $GSTREAMER_REQUIRED])
       fi
    else
       AC_MSG_ERROR([Couldn't find GUPnP-DLNA >= $GUPNP_DLNA_REQUIRED])
    fi
-elif test "x$enable_video_extractor" = "xgstreamer"; then
+elif test "x$enable_generic_media_extractor" = "xgstreamer"; then
    if test "$have_libgstreamer" = "yes"; then
-      have_video_handler_app="GStreamer"
-      have_video_handler="yes"
+      have_generic_media_handler_app="GStreamer"
+      have_generic_media_handler="yes"
    else
       AC_MSG_ERROR([Couldn't find GStreamer >= $GSTREAMER_REQUIRED])
    fi
-elif test "x$enable_video_extractor" = "xxine"; then
+elif test "x$enable_generic_media_extractor" = "xxine"; then
    if test "$have_libxine" = "yes"; then
-      have_video_handler_app="Xine"
-      have_video_handler="yes"
+      have_generic_media_handler_app="Xine"
+      have_generic_media_handler="yes"
    else
       AC_MSG_ERROR([Couldn't find libxine])
    fi
 else
-   have_video_handler="?"
-   have_video_handler_app="An external video player will be called"
+   have_generic_media_handler="?"
+   have_generic_media_handler_app="An external generic media player will be called"
 fi
 
-if test "$have_video_handler_app" = "GStreamer GUPnP-DLNA"; then
+if test "$have_generic_media_handler_app" = "GStreamer GUPnP-DLNA"; then
    AC_DEFINE(HAVE_GUPNP_DLNA, [], [Define if we have GUPnP-DLNA])
    AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
    AM_CONDITIONAL(HAVE_GUPNP_DLNA, true)
    AM_CONDITIONAL(HAVE_GSTREAMER, true)
    AM_CONDITIONAL(HAVE_LIBXINE, false)
-   AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
-elif test "$have_video_handler_app" = "GStreamer"; then
+   AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, false)
+elif test "$have_generic_media_handler_app" = "GStreamer"; then
    AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
    AM_CONDITIONAL(HAVE_GSTREAMER, true)
    AM_CONDITIONAL(HAVE_GUPNP_DLNA, false)
    AM_CONDITIONAL(HAVE_LIBXINE, false)
-   AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
-elif test "$have_video_handler_app" = "Xine"; then
+   AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, false)
+elif test "$have_generic_media_handler_app" = "Xine"; then
    AC_DEFINE(HAVE_LIBXINE, [], [Define if we have Libxine])
    AM_CONDITIONAL(HAVE_LIBXINE, true)
    AM_CONDITIONAL(HAVE_GUPNP_DLNA, false)
    AM_CONDITIONAL(HAVE_GSTREAMER, false)
-   AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
+   AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, false)
 else
-   AC_DEFINE(USING_EXTERNAL_VIDEO_PLAYER, [], [Define that Tracker will try to use external video players])
-   AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, true)
+   AC_DEFINE(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, [], [Define that Tracker will try to use external generic media players])
+   AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, true)
    AM_CONDITIONAL(HAVE_GUPNP_DLNA, false)
    AM_CONDITIONAL(HAVE_GSTREAMER, false)
    AM_CONDITIONAL(HAVE_LIBXINE, false)
@@ -1652,23 +1652,23 @@ AC_ARG_WITH([gstreamer-backend],
 gstreamer_backend="N/A"
 case "x$with_gstreamer_backend" in
      "xdecodebin2")
-        if test "$have_video_handler_app" = "GStreamer GUPnP-DLNA"; then
+        if test "$have_generic_media_handler_app" = "GStreamer GUPnP-DLNA"; then
            AC_MSG_ERROR([Cannot use decodebin2 backend in GStreamer when requesting GUPnP-DLNA support])
-        elif test "$have_video_handler_app" = "GStreamer"; then
+        elif test "$have_generic_media_handler_app" = "GStreamer"; then
            gstreamer_backend="Decodebin2"
            AC_DEFINE(GSTREAMER_BACKEND_DECODEBIN2, [], [Define that GStreamer Decodebin2 should be used])
         fi
      ;;
      "xtagreadbin")
-        if test "$have_video_handler_app" = "GStreamer GUPnP-DLNA"; then
+        if test "$have_generic_media_handler_app" = "GStreamer GUPnP-DLNA"; then
            AC_MSG_ERROR([Cannot use tagreadbin backend in GStreamer when requesting GUPnP-DLNA support])
-        elif test "$have_video_handler_app" = "GStreamer"; then
+        elif test "$have_generic_media_handler_app" = "GStreamer"; then
            gstreamer_backend="Tagreadbin"
            AC_DEFINE(GSTREAMER_BACKEND_TAGREADBIN, [], [Define that GStreamer Tagreadbin should be used])
         fi
      ;;
      "xdiscoverer")
-        if test "$have_video_handler_app" = "GStreamer GUPnP-DLNA" || test "$have_video_handler_app" = "GStreamer"; then
+        if test "$have_generic_media_handler_app" = "GStreamer GUPnP-DLNA" || test "$have_generic_media_handler_app" = "GStreamer"; then
            gstreamer_backend="Discoverer"
            AC_DEFINE(GSTREAMER_BACKEND_DISCOVERER, [], [Define that GStreamer Discoverer should be used])
         fi
@@ -2234,7 +2234,7 @@ Metadata Extractors:
 	Support MS & Open Office:               $have_libgsf
 	Support XML / HTML:                     $have_libxml2
 	Support embedded / sidecar XMP:         $have_exempi
-	Support video formats:                  $have_video_handler ($have_video_handler_app) (backend: $gstreamer_backend)
+	Support generic media formats:          $have_generic_media_handler ($have_generic_media_handler_app) (backend: $gstreamer_backend)
 	Support MP3 album art:                  $selected_for_albumart
 	Support playlists (w/ Totem):           $have_playlist
 
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index f5918ca..23b67ac 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -69,7 +69,7 @@ if HAVE_LIBXINE
 modules_LTLIBRARIES += libextract-xine.la
 endif
 
-if USING_EXTERNAL_VIDEO_PLAYER
+if USING_EXTERNAL_GENERIC_MEDIA_PLAYER
 modules_LTLIBRARIES +=	libextract-mplayer.la \
 			libextract-totem.la
 endif