From dd9a3a5e7165d285fa96b4bf6b21bc3515d719ff Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Fri, 16 Apr 2010 10:44:47 +1000
Subject: configure; Fixes for changes to use mediaservices.

Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 30cd548679d5e2ae026eb5e435e9bdceac6e4987)
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 11b33f6..3509ead 100755
--- a/configure
+++ b/configure
@@ -5201,7 +5201,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
     fi
 
     # Auto-detect GStreamer support (needed for both Phonon & QtMultimedia)
-    if [ "$CFG_PHONON" = "yes" -o "$CFG_MULTIMEDIA" = "yes" ]; then
+    if [ "$CFG_PHONON" = "yes" -o "$CFG_MEDIASERVICES" = "yes" ]; then
         if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
             if [ -n "$PKG_CONFIG" ]; then
                 QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
@@ -6838,7 +6838,7 @@ if [ "$CFG_MEDIASERVICES" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MEDIASERVICES"
 else
     QT_CONFIG="$QT_CONFIG mediaservices"
-    if [ "$CFG_MEDIA_BACKEND" = "yes" ]; then
+    if [ "$CFG_MEDIA_BACKEND" != "no" ]; then
         QT_CONFIG="$QT_CONFIG media-backend"
     fi
 fi
-- 
cgit v0.12