diff options
| author | Anders Bakken <agbakken@gmail.com> | 2010-06-08 08:16:16 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-08 08:16:49 (GMT) |
| commit | c252a57f59fb6291d0e9a6b772b208bd1763779f (patch) | |
| tree | 8674289af57844bf2bd0af05050c64d963a34247 | |
| parent | 249cb1cd68f9bb5417823f534b1af1f8dafccbc5 (diff) | |
| download | Qt-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>
| -rwxr-xr-x | configure | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -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. |