summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAnders Bakken <agbakken@gmail.com>2010-06-08 08:16:16 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-08 08:16:49 (GMT)
commitc252a57f59fb6291d0e9a6b772b208bd1763779f (patch)
tree8674289af57844bf2bd0af05050c64d963a34247 /configure
parent249cb1cd68f9bb5417823f534b1af1f8dafccbc5 (diff)
downloadQt-c252a57f59fb6291d0e9a6b772b208bd1763779f.zip
Qt-c252a57f59fb6291d0e9a6b772b208bd1763779f.tar.gz
Qt-c252a57f59fb6291d0e9a6b772b208bd1763779f.tar.bz2
Fix configure test for DirectFB
The availability of directfb-config does not depend on pkg-config Merge-request: 2409 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 6 insertions, 8 deletions
diff --git a/configure b/configure
index 916b2e5..9aff8cd 100755
--- a/configure
+++ b/configure
@@ -5834,14 +5834,12 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
fi
if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
- if [ -n "$PKG_CONFIG" ]; then
- if $PKG_CONFIG --exists directfb 2>/dev/null; then
- QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
- QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
- elif directfb-config --version >/dev/null 2>&1; then
- QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null`
- QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null`
- fi
+ if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists directfb 2>/dev/null; then
+ QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
+ QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
+ elif directfb-config --version >/dev/null 2>&1; then
+ QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null`
+ QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null`
fi
# QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.