diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-22 13:33:20 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-22 14:52:05 (GMT) |
| commit | fc5d053c330e2f242610e9c2f6e615b14dad9fe4 (patch) | |
| tree | f4884445e515714b89b347f8a78036c6374a480b /configure | |
| parent | caef7e056b8b20d44fa8839b88d62fe0d5802348 (diff) | |
| download | Qt-fc5d053c330e2f242610e9c2f6e615b14dad9fe4.zip Qt-fc5d053c330e2f242610e9c2f6e615b14dad9fe4.tar.gz Qt-fc5d053c330e2f242610e9c2f6e615b14dad9fe4.tar.bz2 | |
Fix configure false positives when checking for symbian
Just check the spec instead of the full path to the spec. This avoids
false positives for testing for 'symbian' in the spec name when the
path to the spec contains it instead.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4630,7 +4630,7 @@ if [ "$CFG_ZLIB" = "auto" ]; then fi if [ "$CFG_S60" = "auto" ]; then - if echo "$XQMAKESPEC" | grep symbian > /dev/null; then + if echo "$XPLATFORM" | grep symbian > /dev/null; then CFG_S60=yes else CFG_S60=no @@ -4638,7 +4638,7 @@ if [ "$CFG_S60" = "auto" ]; then fi if [ "$CFG_SYMBIAN_DEFFILES" = "auto" ]; then - if echo "$XQMAKESPEC" | grep symbian > /dev/null && [ "$CFG_DEV" = "no" ]; then + if echo "$XPLATFORM" | grep symbian > /dev/null && [ "$CFG_DEV" = "no" ]; then CFG_SYMBIAN_DEFFILES=yes else CFG_SYMBIAN_DEFFILES=no @@ -5756,7 +5756,7 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then fi HAVE_STL=no -if echo "$XQMAKESPEC" | grep symbian > /dev/null || "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then +if echo "$XPLATFORM" | grep symbian > /dev/null || "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then HAVE_STL=yes fi @@ -5994,7 +5994,7 @@ elif [ "$CFG_JAVASCRIPTCORE_JIT" = "no" ]; then fi if [ "$CFG_AUDIO_BACKEND" = "auto" ]; then - if echo "$XQMAKESPEC" | grep symbian > /dev/null 2>&1; then + if echo "$XPLATFORM" | grep symbian > /dev/null 2>&1; then "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/audio "audio" $L_FLAGS $I_FLAGS $l_FLAGS else CFG_AUDIO_BACKEND=yes |