diff options
| author | Dominique Leuenberger <dimstar@opensuse.org> | 2012-08-31 19:53:56 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-08-31 19:56:52 +0800 |
| commit | ad2ed55c74bf236ddc5d651b893f617ec3b9ce68 (patch) | |
| tree | d4d17e57803a75a3bfe15697ed0c3bec76f4a51e | |
| parent | e28f99649f26fa7c0200d124f2ba9ec29404892c (diff) | |
| download | gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.tar gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.tar.gz gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.tar.bz2 gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.tar.lz gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.tar.xz gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.tar.zst gsoc2013-evolution-ad2ed55c74bf236ddc5d651b893f617ec3b9ce68.zip | |
Bug 682955 - Support GStreamer 1.0
Check for gstreamer-1.0 first, then fall back to gstreamer-0.10.
No other source code changes required.
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5d980e8880..19456061e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1198,14 +1198,16 @@ AC_ARG_ENABLE([audio-inline], [enable_audio_inline="$enableval"], [enable_audio_inline=yes]) if test "x$enable_audio_inline" = "xyes"; then - PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, have_gst=yes, have_gst=no) + PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], have_gst=yes, + [PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10], have_gst=yes, have_gst=no)], + have_gst=no) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) if test "x$have_gst" = "xyes"; then AC_DEFINE(ENABLE_AUDIO_INLINE, 1, [Define to add support for inlining audio attachments]) else - AC_MSG_ERROR([gstreamer-0.10 is required for the audio-inline plugin. Use --disable-audio-inline to exclude the plugin.]) + AC_MSG_ERROR([gstreamer-1.0 or 0.10 is required for the audio-inline plugin. Use --disable-audio-inline to exclude the plugin.]) fi fi |