diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-04-16 02:53:44 (GMT) |
---|---|---|
committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-04-16 02:53:44 (GMT) |
commit | 2a26cf1a76c954f8e619b24d61650a0adf655551 (patch) | |
tree | c05e089951d996d01191b0cab635a393f09a74f9 /configure | |
parent | 690e0f27ae23189200d98e9300b63914d8e1fe30 (diff) | |
download | Qt-2a26cf1a76c954f8e619b24d61650a0adf655551.zip Qt-2a26cf1a76c954f8e619b24d61650a0adf655551.tar.gz Qt-2a26cf1a76c954f8e619b24d61650a0adf655551.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
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5196,7 +5196,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` |