diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-04-16 02:53:44 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 03:39:19 (GMT) |
| commit | 87b6e243dd30ff62a247ad23a52f8e90f05bf28d (patch) | |
| tree | 2436f579537eafd0deeb29f00aac5cc49f910c96 | |
| parent | 9519073bf55de7a1a22a4f756afb35fa1f87fe46 (diff) | |
| download | Qt-87b6e243dd30ff62a247ad23a52f8e90f05bf28d.zip Qt-87b6e243dd30ff62a247ad23a52f8e90f05bf28d.tar.gz Qt-87b6e243dd30ff62a247ad23a52f8e90f05bf28d.tar.bz2 | |
Fixed configure check for gstreamer.
Gstreamer should be detected not only when phonon or mediaservices
are enabled, but also when they are not disabled.
Reviewed-by: Justin McPherson
(cherry picked from commit 2a26cf1a76c954f8e619b24d61650a0adf655551)
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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_MEDIASERVICES" = "yes" ]; then + if [ "$CFG_PHONON" != "no" -o "$CFG_MEDIASERVICES" != "no" ]; 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` |