diff options
author | Sam Thursfield <sam@afuera.me.uk> | 2017-02-06 19:09:52 +0100 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2017-02-06 21:26:09 +0100 |
commit | 2a46521360dded1796838e28adec9c85b5ec7bfc (patch) | |
tree | f3e23dd4866a316bea32363386dbc162ba628bf1 | |
parent | 397883a2128ef2099bbad9da75d213f4724db277 (diff) | |
download | tracker-2a46521360dded1796838e28adec9c85b5ec7bfc.tar.gz |
configure.ac: Remove obsolete bits for 'external' media handler
There's no code to actually implement this nowadays, the configure.ac
stuff is a relic.
-rw-r--r-- | configure.ac | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index b11a0cd9e..b80d4a66c 100644 --- a/configure.ac +++ b/configure.ac @@ -1803,7 +1803,7 @@ AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes") AC_ARG_ENABLE(generic-media-extractor, AS_HELP_STRING([--enable-generic-media-extractor=ARG], - [enables one of the (gstreamer, libav, external, auto) generic media extractor backends [[default=auto]]]), + [enables one of the (gstreamer, libav, auto) generic media extractor backends [[default=auto]]]), [enable_generic_media_extractor=$enableval], [enable_generic_media_extractor=auto]) @@ -1843,38 +1843,38 @@ AC_SUBST(AVUTIL_LIBS) if test "x$enable_generic_media_extractor" = "xauto"; then if test "$have_libgstreamer" = "yes"; then have_generic_media_handler="yes" - have_generic_media_handler_app="GStreamer" + generic_media_handler_name="GStreamer" elif test "$have_libav" = "yes"; then - have_generic_media_handler_app="libav" + generic_media_handler_name="libav" have_generic_media_handler="yes" else - have_generic_media_handler="?" - have_generic_media_handler_app="An external generic_media player will be called" + have_generic_media_handler="no" + generic_media_handler_name="none" fi elif test "x$enable_generic_media_extractor" = "xgstreamer"; then if test "$have_libgstreamer" = "yes"; then - have_generic_media_handler_app="GStreamer" + generic_media_handler_name="GStreamer" have_generic_media_handler="yes" else AC_MSG_ERROR([Could not find GStreamer >= $GSTREAMER_REQUIRED]) fi elif test "x$enable_generic_media_extractor" = "xlibav"; then if test "$have_libavformat" = "yes" && test "$have_libavcodec" = "yes" && test "$have_libavutil" = "yes"; then - have_generic_media_handler_app="libav" + generic_media_handler_name="libav" have_generic_media_handler="yes" else AC_MSG_ERROR([Could not find libav]) fi else - have_generic_media_handler="?" - have_generic_media_handler_app="An external generic media player will be called" + have_generic_media_handler="no" + generic_media_handler_name="none" fi -if test "$have_generic_media_handler_app" = "GStreamer"; then +if test "$generic_media_handler_name" = "GStreamer"; then AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer]) AM_CONDITIONAL(HAVE_GSTREAMER, true) AM_CONDITIONAL(HAVE_LIBAV, false) -elif test "$have_generic_media_handler_app" = "libav"; then +elif test "$generic_media_handler_name" = "libav"; then AC_DEFINE(HAVE_LIBAV, [], [Define if we have libav]) AM_CONDITIONAL(HAVE_LIBAV, true) AM_CONDITIONAL(HAVE_GSTREAMER, false) @@ -1893,7 +1893,7 @@ AC_ARG_WITH([gstreamer-backend], [with_gstreamer_backend=$withval], [with_gstreamer_backend=discoverer]) -if test "$have_generic_media_handler_app" != "GStreamer"; then +if test "$generic_media_handler_name" != "GStreamer"; then AC_MSG_WARN([No need to specify a GStreamer backend if not using GStreamer]) gstreamer_backend="N/A" else @@ -2841,7 +2841,7 @@ Metadata Extractors: Support MS & Open Office: $have_libgsf Support XML / HTML: $have_libxml2 Support embedded / sidecar XMP: $have_exempi - Support generic media formats: $have_generic_media_handler ($have_generic_media_handler_app) (backend: $gstreamer_backend) + Support generic media formats: $have_generic_media_handler ($generic_media_handler_name) (backend: $gstreamer_backend) Support cue sheet parsing: $have_libcue (libcue2.0: $have_libcue2) Support playlists (w/ Totem): $have_playlist Support ISO image parsing: $have_libosinfo |