Changeset 561 for trunk/configure


Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/configure

    r2 r561  
    11#!/bin/sh
    2 #
    3 # Configures to build the Qt library
    4 #
    5 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    6 # Contact: Qt Software Information (qt-info@nokia.com)
    7 #
    8 # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    9 # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    10 #
     2#############################################################################
     3##
     4## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     5## All rights reserved.
     6## Contact: Nokia Corporation (qt-info@nokia.com)
     7##
     8## This file is the build configuration utility of the Qt Toolkit.
     9##
     10## $QT_BEGIN_LICENSE:LGPL$
     11## Commercial Usage
     12## Licensees holding valid Qt Commercial licenses may use this file in
     13## accordance with the Qt Commercial License Agreement provided with the
     14## Software or, alternatively, in accordance with the terms contained in
     15## a written agreement between you and Nokia.
     16##
     17## GNU Lesser General Public License Usage
     18## Alternatively, this file may be used under the terms of the GNU Lesser
     19## General Public License version 2.1 as published by the Free Software
     20## Foundation and appearing in the file LICENSE.LGPL included in the
     21## packaging of this file.  Please review the following information to
     22## ensure the GNU Lesser General Public License version 2.1 requirements
     23## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
     24##
     25## In addition, as a special exception, Nokia gives you certain additional
     26## rights.  These rights are described in the Nokia Qt LGPL Exception
     27## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
     28##
     29## GNU General Public License Usage
     30## Alternatively, this file may be used under the terms of the GNU
     31## General Public License version 3.0 as published by the Free Software
     32## Foundation and appearing in the file LICENSE.GPL included in the
     33## packaging of this file.  Please review the following information to
     34## ensure the GNU General Public License version 3.0 requirements will be
     35## met: http://www.gnu.org/copyleft/gpl.html.
     36##
     37## If you have questions regarding the use of this file, please contact
     38## Nokia at qt-info@nokia.com.
     39## $QT_END_LICENSE$
     40##
     41#############################################################################
    1142
    1243#-------------------------------------------------------------------------------
    … …  
    4778# utility functions
    4879#-------------------------------------------------------------------------------
     80
     81shellEscape()
     82{
     83    echo "$@" | sed 's/ /\ /g'
     84}
    4985
    5086# Adds a new qmake variable to the cache
    … …  
    71107}
    72108
     109# Helper function for getQMakeConf. It parses include statements in
     110# qmake.conf and prints out the expanded file
     111getQMakeConf1()
     112{
     113    while read line; do case "$line" in
     114        include*)
     115            inc_file=`echo "$line" | sed -n -e "/^include.*(.*)/s/include.*(\(.*\)).*$/\1/p"`
     116            current_dir=`dirname "$1"`
     117            conf_file="$current_dir/$inc_file"
     118            if [ ! -e  "$conf_file" ]; then
     119                echo "WARNING: Unable to find file $conf_file" >&2
     120                continue
     121            fi
     122            getQMakeConf1 "$conf_file"
     123        ;;
     124        *)
     125            echo "$line"
     126        ;;
     127    esac; done < "$1"
     128}
     129
     130
    73131# relies on $QMAKESPEC being set correctly. parses include statements in
    74132# qmake.conf and prints out the expanded file
    … …  
    79137        tmpSPEC="$1"
    80138    fi
    81     $AWK -v "QMAKESPEC=$tmpSPEC" '
    82 /^include\(.+\)$/{
    83     fname = QMAKESPEC "/" substr($0, 9, length($0) - 9)
    84     while ((getline line < fname) > 0)
    85         print line
    86     close(fname)
    87     next
     139    getQMakeConf1 "$tmpSPEC/qmake.conf"
    88140}
    89 { print }' "$tmpSPEC/qmake.conf"
     141
     142# relies on $TEST_COMPILER being set correctly
     143compilerSupportsFlag()
     144{
     145    cat >conftest.cpp <<EOF
     146int main() { return 0; }
     147EOF
     148    "$TEST_COMPILER" "$@" -o conftest.o conftest.cpp
     149    ret=$?
     150    rm -f conftest.cpp conftest.o
     151    return $ret
     152}
     153
     154# relies on $TEST_COMPILER being set correctly
     155linkerSupportsFlag()
     156{
     157    lflags=-Wl
     158    for flag
     159    do
     160        safe_flag=`shellEscape "$flag"`
     161        lflags=$lflags,$safe_flag
     162    done
     163    compilerSupportsFlag "$lflags" >/dev/null 2>&1
    90164}
    91165
    … …  
    167241CFG_NOKIA=no
    168242CFG_EMBEDDED=no
     243CFG_RTOS_ENABLED=yes
    169244EditionString=Commercial
    170245
    … …  
    203278            fi
    204279            ;;
    205         h|help|--help|-help)
     280        -h|help|--help|-help)
    206281            if [ "$VAL" = "yes" ]; then
    207282                OPT_HELP="$VAL"
    … …  
    280355            COMMERCIAL_USER="yes"
    281356            break
    282         else [ "$commercial" = "o" ];
     357        elif [ "$commercial" = "o" ]; then
    283358            COMMERCIAL_USER="no"
    284359            break
    … …  
    303378    # one of commercial editions
    304379    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
    305     [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
     380    [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=no
    306381
    307382    # read in the license file
    … …  
    312387            echo "You are using an old license file."
    313388            echo
    314             echo "Please install the license file supplied by Qt Software,"
     389            echo "Please install the license file supplied by Nokia,"
    315390            echo "or install the Qt Open Source Edition if you intend to"
    316391            echo "develop free software."
    … …  
    345420    fi
    346421    ProductCode=`echo $LicenseKeyExt | cut -f 1 -d - | cut -b 1`
    347     PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d - | cut -b 1`
     422    PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d -`
    348423    LicenseTypeCode=`echo $LicenseKeyExt | cut -f 3 -d -`
    349424    LicenseFeatureCode=`echo $LicenseKeyExt | cut -f 4 -d - | cut -b 1`
    … …  
    372447    Z4M|R4M|Q4M)
    373448        LicenseType="Evaluation"
     449        QMakeVar add DEFINES QT_EVAL
    374450        case $ProductCode in
    375451         B)
    … …  
    388464    # verify that we are licensed to use Qt on this platform
    389465    LICENSE_EXTENSION=
    390     if [ "$PlatformCode" = "X" ]; then
    391         # Qt All-OS
    392         LICENSE_EXTENSION="-ALLOS"
    393     elif [ "$PLATFORM_QWS" = "yes" ]; then
    394         case $PlatformCode in
    395         2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W)
     466    case "$PlatformCode" in
     467        *L)
     468            CFG_RTOS_ENABLED=yes
     469            PlatformCode=`echo "$PlatformCode" | sed 'h;y/8NPQRTZ/UCWX9M7/;x;G;s/\(.\)....\(.\)./\1\2/'`
     470            ;;
     471        *)
     472            CFG_RTOS_ENABLED=no
     473            PlatformCode=`echo "$PlatformCode" | sed 's/.$//'`
     474            ;;
     475    esac
     476    case "$PlatformCode,$PLATFORM_MAC,$PLATFORM_QWS" in
     477        X9,* | XC,* | XU,* | XW,* | XM,*)
     478            # Qt All-OS
     479            LICENSE_EXTENSION="-ALLOS"
     480            ;;
     481        8M,* | KM,* | S9,* | SC,* | SU,* | SW,* | X9,* | XC,* | XU,* | XW,*)
    396482            # Qt for Embedded Linux
    397483            LICENSE_EXTENSION="-EMBEDDED"
    398484            ;;
     485        6M,*,no | N7,*,no | N9,*,no | NX,*,no)
     486            # Embedded no-deploy
     487            LICENSE_EXTENSION="-EMBEDDED"
     488            ;;
     489        FM,*,no | LM,yes,* | ZM,no,no)
     490            # Desktop
     491            LICENSE_EXTENSION="-DESKTOP"
     492            ;;
    399493        *)
     494            Platform=Linux/X11
     495            [ "$PLATFORM_MAC" = "yes" ] && Platform='Mac OS X'
     496            [ "$PLATFORM_QWS" = "yes" ] && Platform='Embedded Linux'
    400497            echo
    401             echo "You are not licensed for Qt for Embedded Linux."
     498            echo "You are not licensed for the $Platform platform."
    402499            echo
    403             echo "Please contact sales@trolltech.com to upgrade your license"
    404             echo "to include Qt for Embedded Linux, or install the"
    405             echo "Qt Open Source Edition if you intend to develop free software."
     500            echo "Please contact qt-info@nokia.com to upgrade your license to"
     501            echo "include the $Platform platform, or install the Qt Open Source Edition"
     502            echo "if you intend to develop free software."
    406503            exit 1
    407504            ;;
    408         esac
    409     elif [ "$PLATFORM_MAC" = "yes" ]; then
    410         case $PlatformCode in
    411         2|4|5|7|9|B|C|E|F|G|L|M|U|W|Y)
    412             # Qt/Mac
    413             LICENSE_EXTENSION="-DESKTOP"
    414             ;;
    415         3|6|8|A|D|H|J|K|P|Q|S|V)
    416             # Embedded no-deploy
    417             LICENSE_EXTENSION="-EMBEDDED"
    418             ;;
    419         *)
    420             echo
    421             echo "You are not licensed for the Qt/Mac platform."
    422             echo
    423             echo "Please contact sales@trolltech.com to upgrade your license"
    424             echo "to include the Qt/Mac platform."
    425             exit 1
    426             ;;
    427         esac
    428      else
    429          case $PlatformCode in
    430          2|3|4|5|7|D|E|F|J|M|Q|S|T|V|Z)
    431              # Qt/X11
    432              LICENSE_EXTENSION="-DESKTOP"
    433              ;;
    434          6|8|9|A|B|C|G|H|K|P|U|W)
    435              # Embedded no-deploy
    436              LICENSE_EXTENSION="-EMBEDDED"
    437              ;;
    438          *)
    439              echo
    440              echo "You are not licensed for the Qt/X11 platform."
    441              echo
    442              echo "Please contact sales@trolltech.com to upgrade your license to"
    443              echo "include the Qt/X11 platform, or install the Qt Open Source Edition"
    444              echo "if you intend to develop free software."
    445              exit 1
    446              ;;
    447         esac
    448     fi
     505    esac
    449506
    450507    if test -r "$relpath/.LICENSE"; then
    … …  
    473530
    474531    case "$LicenseFeatureCode" in
    475     G|L)
     532    B|G|L|Y)
    476533        # US
    477534        case "$LicenseType" in
    … …  
    484541        esac
    485542        ;;
    486     2|5)
     543    2|4|5|F)
    487544        # non-US
    488545        case "$LicenseType" in
    … …  
    500557        exit 1
    501558        ;;
     559    esac
     560    case "$LicenseFeatureCode" in
     561        4|B|F|Y)
     562            CFG_RTOS_ENABLED=yes
     563            ;;
     564        2|5|G|L)
     565            CFG_RTOS_ENABLED=no
     566            ;;
    502567    esac
    503568    if [ '!' -f "$outpath/LICENSE" ]; then
    … …  
    543608QMakeVar add styles "cde mac motif plastique cleanlooks windows"
    544609QMakeVar add decorations "default windows styled"
    545 QMakeVar add gfx-drivers "linuxfb"
     610QMakeVar add mouse-drivers "pc"
     611if [ "$UNAME_SYSTEM" = "Linux" ] ; then
     612    QMakeVar add gfx-drivers "linuxfb"
     613    QMakeVar add mouse-drivers "linuxtp"
     614fi
    546615QMakeVar add kbd-drivers "tty"
    547 QMakeVar add mouse-drivers "pc linuxtp"
    548616
    549617if [ "$CFG_DEV" = "yes" ]; then
    … …  
    555623
    556624# the minimum version of libdbus-1 that we require:
    557 MIN_DBUS_1_VERSION=0.62
     625MIN_DBUS_1_VERSION=0.93
    558626
    559627# initalize internal variables
    … …  
    561629CFG_PROFILE=no
    562630CFG_EXCEPTIONS=unspecified
     631CFG_SCRIPT=auto # (yes|no|auto)
    563632CFG_SCRIPTTOOLS=auto # (yes|no|auto)
    564633CFG_XMLPATTERNS=auto # (yes|no|auto)
    … …  
    571640CFG_SM=auto
    572641CFG_XSHAPE=auto
     642CFG_XSYNC=auto
    573643CFG_XINERAMA=runtime
    574644CFG_XFIXES=runtime
    … …  
    589659CFG_MITSHM=auto
    590660CFG_OPENGL=auto
     661CFG_OPENVG=no
     662CFG_OPENVG_LC_INCLUDES=no
     663CFG_OPENVG_SHIVA=no
     664CFG_OPENVG_ON_OPENGL=no
     665CFG_EGL=no
     666CFG_EGL_GLES_INCLUDES=no
    591667CFG_SSE=auto
    592668CFG_FONTCONFIG=auto
    … …  
    600676CFG_PHONON=auto
    601677CFG_PHONON_BACKEND=yes
     678CFG_MULTIMEDIA=yes
     679CFG_AUDIO_BACKEND=yes
    602680CFG_SVG=yes
     681CFG_DECLARATIVE=auto
    603682CFG_WEBKIT=auto # (yes|no|auto)
    604 
    605 CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
     683CFG_JAVASCRIPTCORE_JIT=auto
     684
     685CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
    606686CFG_GFX_ON="linuxfb multiscreen"
    607687CFG_GFX_PLUGIN_AVAILABLE=
    608688CFG_GFX_PLUGIN=
    609689CFG_GFX_OFF=
    610 CFG_KBD_AVAILABLE="tty usb sl5000 yopy vr41xx qvfb"
     690CFG_KBD_AVAILABLE="tty linuxinput qvfb"
    611691CFG_KBD_ON="tty"    #default, see QMakeVar above
    612 CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb"
     692CFG_MOUSE_AVAILABLE="pc linuxtp linuxinput tslib qvfb"
    613693CFG_MOUSE_ON="pc linuxtp"   #default, see QMakeVar above
     694
     695if [ -f "$relpath/src/gui/embedded/qscreenqnx_qws.cpp" ]; then
     696    CFG_KBD_AVAILABLE="${CFG_KBD_AVAILABLE} qnx"
     697    CFG_MOUSE_AVAILABLE="${CFG_MOUSE_AVAILABLE} qnx"
     698    CFG_GFX_AVAILABLE="${CFG_GFX_AVAILABLE} qnx"
     699fi
    614700
    615701CFG_ARCH=
    … …  
    642728CFG_PRECOMPILE=auto
    643729CFG_SEPARATE_DEBUG_INFO=auto
     730CFG_SEPARATE_DEBUG_INFO_NOCOPY=no
    644731CFG_REDUCE_EXPORTS=auto
    645732CFG_MMX=auto
    … …  
    659746CFG_ARMFPA=auto
    660747CFG_IWMMXT=no
     748CFG_NEON=auto
    661749CFG_CLOCK_GETTIME=auto
    662750CFG_CLOCK_MONOTONIC=auto
    … …  
    669757CFG_FRAMEWORK=auto
    670758CFG_MAC_ARCHS=
     759MAC_CONFIG_TEST_COMMANDLINE=  # used to make the configure tests run with the correct arch's and SDK settings
    671760CFG_MAC_DWARF2=auto
    672761CFG_MAC_XARCH=auto
    … …  
    693782CFG_SILENT=no
    694783CFG_GRAPHICS_SYSTEM=default
     784CFG_ALSA=auto
    695785
    696786# initalize variables used for installation
    … …  
    716806QT_CFLAGS_SQLITE=
    717807QT_LFLAGS_SQLITE=
     808QT_LFLAGS_ODBC="-lodbc"
    718809
    719810# flags for libdbus-1
    … …  
    742833  for a in "$relpath/src/plugins/sqldrivers/"*; do
    743834     if [ -d "$a" ]; then
    744          base_a=`basename $a`
     835         base_a=`basename "$a"`
    745836         CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
    746837         eval "CFG_SQL_${base_a}=auto"
    … …  
    753844  for a in "$relpath/src/plugins/decorations/"*; do
    754845     if [ -d "$a" ]; then
    755          base_a=`basename $a`
     846         base_a=`basename "$a"`
    756847         CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
    757848     fi
    … …  
    763854  for a in "$relpath/src/plugins/kbddrivers/"*; do
    764855     if [ -d "$a" ]; then
    765          base_a=`basename $a`
     856         base_a=`basename "$a"`
    766857         CFG_KBD_PLUGIN_AVAILABLE="${CFG_KBD_PLUGIN_AVAILABLE} ${base_a}"
    767858     fi
    … …  
    773864  for a in "$relpath/src/plugins/mousedrivers/"*; do
    774865     if [ -d "$a" ]; then
    775          base_a=`basename $a`
     866         base_a=`basename "$a"`
    776867         CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
    777868     fi
    … …  
    783874  for a in "$relpath/src/plugins/gfxdrivers/"*; do
    784875     if [ -d "$a" ]; then
    785          base_a=`basename $a`
     876         base_a=`basename "$a"`
    786877         CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
    787878     fi
    … …  
    831922        ;;
    832923    #Qt style yes options
    833         -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config)
     924        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config)
    834925        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
    835926        VAL=yes
    … …  
    837928    #Qt style options that pass an argument
    838929    -qconfig)
    839         if [ "$PLATFORM_QWS" = "yes" ]; then
    840             CFG_QCONFIG="$VAL"
    841             VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
    842             shift
    843             VAL=$1
    844         else
    845             UNKNOWN_ARG=yes
    846         fi
     930        if [ "$PLATFORM_QWS" != "yes" ]; then
     931            echo
     932            echo "WARNING: -qconfig is only tested and supported on Qt for Embedded Linux."
     933            echo
     934        fi
     935        CFG_QCONFIG="$VAL"
     936        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
     937        shift
     938        VAL=$1
    847939        ;;
    848940    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
    … …  
    878970    -opengl)
    879971        VAR=opengl
     972        # this option may or may not be followed by an argument
     973        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
     974            VAL=yes
     975        else
     976            shift;
     977            VAL=$1
     978        fi
     979        ;;
     980    -openvg)
     981        VAR=openvg
    880982        # this option may or may not be followed by an argument
    881983        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
    … …  
    11301232        fi
    11311233        ;;
     1234    openvg)
     1235        if [ "$VAL" = "auto" ] || [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
     1236            CFG_OPENVG="$VAL"
     1237        else
     1238            UNKNOWN_OPT=yes
     1239        fi
     1240        ;;
    11321241    graphicssystem)
    11331242        if [ "$PLATFORM_QWS" = "yes" ]; then
    … …  
    11401249            if  [ "$VAL" = "opengl" ]; then
    11411250                CFG_GRAPHICS_SYSTEM="opengl"
     1251            elif [ "$VAL" = "openvg" ]; then
     1252                CFG_GRAPHICS_SYSTEM="openvg"
    11421253            elif [ "$VAL" = "raster" ]; then
    11431254                CFG_GRAPHICS_SYSTEM="raster"
    … …  
    11471258        fi
    11481259        ;;
    1149            
     1260
    11501261    qvfb) # left for commandline compatibility, not documented
    11511262        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
    … …  
    14191530        fi
    14201531        ;;
     1532    xsync)
     1533        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
     1534            CFG_XSYNC="$VAL"
     1535        else
     1536            UNKNOWN_OPT=yes
     1537        fi
     1538        ;;
    14211539    xinput)
    14221540        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
    … …  
    14431561        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
    14441562            CFG_SEPARATE_DEBUG_INFO="$VAL"
     1563        elif [ "$VAL" = "nocopy" ] ; then
     1564            CFG_SEPARATE_DEBUG_INFO="yes"
     1565            CFG_SEPARATE_DEBUG_INFO_NOCOPY="yes"
    14451566        else
    14461567            UNKNOWN_OPT=yes
    … …  
    14851606        CFG_IWMMXT="yes"
    14861607        ;;
     1608    neon)
     1609        if [ "$VAL" = "no" ]; then
     1610            CFG_NEON="$VAL"
     1611        else
     1612            UNKNOWN_OPT=yes
     1613        fi
     1614        ;;
    14871615    reduce-relocations)
    14881616        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
    … …  
    17031831        fi
    17041832        ;;
     1833    script)
     1834        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
     1835            CFG_SCRIPT="yes"
     1836        else
     1837            if [ "$VAL" = "no" ]; then
     1838                CFG_SCRIPT="no"
     1839            else
     1840                UNKNOWN_OPT=yes
     1841            fi
     1842        fi
     1843        ;;
    17051844    scripttools)
    17061845        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
    … …  
    17241863            fi
    17251864        fi
     1865        ;;
     1866    declarative)
     1867        if [ "$VAL" = "yes" ]; then
     1868            CFG_DECLARATIVE="yes"
     1869        else
     1870            if [ "$VAL" = "no" ]; then
     1871                CFG_DECLARATIVE="no"
     1872            else
     1873                UNKNOWN_OPT=yes
     1874            fi
     1875        fi
    17261876        ;;
    17271877    webkit)
    … …  
    17341884                UNKNOWN_OPT=yes
    17351885            fi
     1886        fi
     1887        ;;
     1888    javascript-jit)
     1889        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
     1890            CFG_JAVASCRIPTCORE_JIT="$VAL"
     1891        else
     1892            UNKNOWN_OPT=yes
    17361893        fi
    17371894        ;;
    … …  
    19322089        fi
    19332090        ;;
     2091    multimedia)
     2092        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
     2093            CFG_MULTIMEDIA="$VAL"
     2094        else
     2095            UNKNOWN_OPT=yes
     2096        fi
     2097        ;;
     2098    audio-backend)
     2099        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
     2100            CFG_AUDIO_BACKEND="$VAL"
     2101        else
     2102            UNKNOWN_OPT=yes
     2103        fi
     2104        ;;
    19342105    *)
    19352106        UNKNOWN_OPT=yes
    … …  
    19862157done
    19872158
     2159# find perl
     2160PERL="/usr/bin/perl"
     2161if "$WHICH" perl >/dev/null 2>&1 && ( perl /dev/null ) >/dev/null 2>&1; then
     2162    PERL=`$WHICH perl`
     2163fi
     2164
    19882165### skip this if the user just needs help...
    19892166if [ "$OPT_HELP" != "yes" ]; then
    … …  
    20012178fi
    20022179if [ "$OPT_SHADOW" = "yes" ]; then
    2003     if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" ]; then
     2180    if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then
    20042181        echo >&2 "You cannot make a shadow build from a source tree containing a previous build."
    20052182        echo >&2 "Cannot proceed."
    … …  
    21012278fi
    21022279
    2103 # symlink files from src/gui/embedded neccessary to build qvfb
    2104 if [ "$CFG_DEV" = "yes" ]; then
    2105     for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do
    2106         dest="${relpath}/tools/qvfb/${f}"
    2107         rm -f "$dest"
    2108         ln -s "${relpath}/src/gui/embedded/${f}" "${dest}"
    2109     done
    2110 fi
    2111 
    21122280# symlink fonts to be able to run application from build directory
    21132281if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then
    … …  
    21312299    for mk in gmake make; do
    21322300        if "$WHICH" $mk >/dev/null 2>&1; then
    2133             MAKE=`$WHICH $mk`
     2301            MAKE=`"$WHICH" $mk`
    21342302            break
    21352303        fi
    … …  
    21402308        exit 1
    21412309    fi
     2310    # export MAKE, we need it later in the config.tests
     2311    export MAKE
    21422312fi
    21432313
    … …  
    21802350            *86_64)
    21812351                PLATFORM=qws/linux-x86_64-g++
    2182                 ;;
    2183             *ppc)
    2184                 PLATFORM=qws/linux-ppc-g++
    21852352                ;;
    21862353            *)
    … …  
    22012368                        CFG_EMBEDDED=x86_64
    22022369                        ;;
    2203                     *ppc)
    2204                         CFG_EMBEDDED=ppc
    2205                         ;;
    22062370                    *)
    22072371                        CFG_EMBEDDED=generic
    … …  
    22112375            fi
    22122376            XPLATFORM="qws/linux-$CFG_EMBEDDED-g++"
     2377        fi
     2378        ;;
     2379    QNX:*)
     2380        [ -z "$PLATFORM" ] && PLATFORM=unsupported/qws/qnx-generic-g++
     2381        if [ -z "$XPLATFORM" ]; then
     2382            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
     2383            XPLATFORM="unsupported/qws/qnx-$CFG_EMBEDDED-g++"
    22132384        fi
    22142385        ;;
    … …  
    23642535        PLATFORM=unixware-g++
    23652536        ;;
     2537     QNX:*)
     2538        PLATFORM=unsupported/qnx-g++
     2539        ;;
    23662540     *)
    23672541        if [ "$OPT_HELP" != "yes" ]; then
    … …  
    24782652        exit 1
    24792653    fi
     2654fi
     2655
     2656if [ "$CFG_RTOS_ENABLED" = "no" ]; then
     2657    case `basename "$XPLATFORM"` in
     2658        qnx-* | vxworks-*)
     2659            echo ""
     2660            echo "You are not licensed for Qt for `basename $XPLATFORM`."
     2661            echo ""
     2662            echo "Please contact qt-info@nokia.com to upgrade your license to"
     2663            echo "include this platform, or install the Qt Open Source Edition"
     2664            echo "if you intend to develop free software."
     2665            exit 1
     2666            ;;
     2667    esac
    24802668fi
    24812669
    … …  
    25892777        CFG_HOST_ARCH=sparc
    25902778        ;;
     2779    QNX:*:*)
     2780        case "$UNAME_MACHINE" in
     2781        x86pc)
     2782            if [ "$OPT_VERBOSE" = "yes" ]; then
     2783                echo "    QNX on Intel 80x86 (i386)"
     2784            fi
     2785            CFG_HOST_ARCH=i386
     2786            ;;
     2787        esac
     2788        ;;
    25912789    *:*:*)
    25922790        if [ "$OPT_VERBOSE" = "yes" ]; then
    … …  
    26692867fi
    26702868if [ -z "$PKG_CONFIG" ]; then
    2671     PKG_CONFIG=`$WHICH pkg-config 2>/dev/null`
     2869    PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
    26722870fi
    26732871
    … …  
    26952893        fi
    26962894    else
     2895        echo >&2 ""
     2896        echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling."
     2897        echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for"
     2898        echo >&2 "dependencies"
     2899        echo >&2 ""
    26972900        PKG_CONFIG=""
    26982901    fi
    26992902fi
    27002903
    2701 # check -arch arguments for validity.
     2904# process CFG_MAC_ARCHS
    27022905if [ "$PLATFORM_MAC" = "yes" ]; then
    2703     ALLOWED="x86 ppc x86_64 ppc64"
    2704     for i in $CFG_MAC_ARCHS
     2906#   check -arch arguments for validity.
     2907    ALLOWED="x86 ppc x86_64 ppc64 i386"
     2908    # Save the list so we can re-write it using only valid values
     2909    CFG_MAC_ARCHS_IN="$CFG_MAC_ARCHS"
     2910    CFG_MAC_ARCHS=
     2911    for i in $CFG_MAC_ARCHS_IN
    27052912    do
    27062913        if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then
    2707             echo "Unknown architecture: \"$i\". Supported architectures: x86 ppc x86_64 ppc64";
     2914            echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64";
    27082915            exit 2;
    27092916        fi
     2917        if [ "$i" = "i386" -o "$i" = "x86" ]; then
     2918            # These are synonymous values
     2919            # CFG_MAC_ARCHS requires x86 while GCC requires i386
     2920            CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86"
     2921            MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -arch i386"
     2922        else
     2923            CFG_MAC_ARCHS="$CFG_MAC_ARCHS $i"
     2924            MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -arch $i"
     2925        fi
    27102926    done
     2927fi
     2928
     2929# pass on $CFG_SDK to the configure tests.
     2930if [ '!' -z "$CFG_SDK" ]; then
     2931    MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -sdk $CFG_SDK"
    27112932fi
    27122933
    … …  
    27282949TEST_COMPILER="$CC"
    27292950[ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
     2951if [ -z "$TEST_COMPILER" ]; then
     2952    echo "ERROR: Cannot set the compiler for the configuration tests"
     2953    exit 1
     2954fi
    27302955
    27312956# auto-detect precompiled header support
    … …  
    27462971
    27472972#auto-detect DWARF2 on the mac
    2748 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then
     2973if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
    27492974    if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
    27502975        CFG_MAC_DWARF2=no
    … …  
    27552980
    27562981# auto-detect support for -Xarch on the mac
    2757 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then
     2982if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then
    27582983    if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
    27592984        CFG_MAC_XARCH=no
    … …  
    28403065fi
    28413066
     3067# Print a warning if configure was called with the 10.4u SDK option on Snow Leopard
     3068# with the default mkspec. The 10.4u SDK does not support gcc 4.2.
     3069if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
     3070    # get the darwin version. 10.0.0 and up means snow leopard.
     3071    VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
     3072    if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
     3073        echo
     3074        echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
     3075        echo
     3076    fi
     3077fi
     3078
    28423079# x11 tests are done after qmake is built
    28433080
    … …  
    28693106if [ -z "$QT_INSTALL_PREFIX" ]; then
    28703107    if [ "$CFG_DEV" = "yes" ]; then
    2871         QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default
     3108        QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default
    28723109    elif [ "$PLATFORM_QWS" = "yes" ]; then
    28733110        QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"
    … …  
    30543291        [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
    30553292        [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
    3056         [-no-make <part>] [-R <string>]  [-l <string>] [-no-rpath]  [-rpath] [-continue]
     3293        [-nomake <part>] [-R <string>]  [-l <string>] [-no-rpath]  [-rpath] [-continue]
    30573294        [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]
    30583295        [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked]
    … …  
    30603297        [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
    30613298        [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
    3062         [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
    3063         [-no-openssl] [-openssl] [-openssl-linked]
    3064         [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit]
    3065         [-no-scripttools] [-scripttools]
     3299        [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
     3300        [-no-audio-backend] [-audio-backend] [-no-openssl] [-openssl] [-openssl-linked]
     3301        [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
     3302        [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative]
    30663303
    30673304        [additional platform specific options (see below)]
    … …  
    31963433                         is used and exceptions are enabled.
    31973434
     3435    -no-multimedia ..... Do not build the QtMultimedia module.
     3436 +  -multimedia ........ Build the QtMultimedia module.
     3437
     3438    -no-audio-backend .. Do not build the platform audio backend into QtMultimedia.
     3439 +  -audio-backend ..... Build the platform audio backend into QtMultimedia if available.
     3440
    31983441    -no-phonon ......... Do not build the Phonon module.
    31993442 +  -phonon ............ Build the Phonon module.
    … …  
    32093452                         WebKit is built if a decent C++ compiler is used.
    32103453
     3454    -no-javascript-jit . Do not build the JavaScriptCore JIT compiler.
     3455 +  -javascript-jit .... Build the JavaScriptCore JIT compiler.
     3456
     3457    -no-script ......... Do not build the QtScript module.
     3458 +  -script ............ Build the QtScript module.
     3459
    32113460    -no-scripttools .... Do not build the QtScriptTools module.
    32123461 +  -scripttools ....... Build the QtScriptTools module.
     3462
     3463 +  -no-declarative .....Do not build the declarative module.
     3464    -declarative ....... Build the declarative module.
    32133465
    32143466    -platform target ... The operating system and compiler you are building
    … …  
    34533705 +  -opengl <api> ...... Enable OpenGL support.
    34543706                         With no parameter, this will auto-detect the "best"
    3455                          OpenGL API to use. If desktop OpenGL is avaliable, it
     3707                         OpenGL API to use. If desktop OpenGL is available, it
    34563708                         will be used. Use desktop, es1, es1cl or es2 for <api>
    34573709                         to force the use of the Desktop (OpenGL 1.x or 2.x),
    34583710                         OpenGL ES 1.x Common profile, 1.x Common Lite profile
    34593711                         or 2.x APIs instead. On X11, the EGL API will be used
    3460                          to manage GL contexts in the case of OpenGL ES.
     3712                         to manage GL contexts in the case of OpenGL ES
     3713
     3714     -no-openvg ........ Do not support OpenVG.
     3715 +   -openvg ........... Enable OpenVG support.
     3716                         Requires EGL support, typically supplied by an OpenGL
     3717                         or other graphics implementation.
    34613718
    34623719 $SMN  -no-sm ............. Do not support X Session Management.
    … …  
    34663723 $SHY  -xshape ............ Compile XShape support.
    34673724                         Requires X11/extensions/shape.h.
     3725
     3726 $SHN  -no-xsync .......... Do not compile XSync support.
     3727 $SHY  -xsync ............. Compile XSync support.
     3728                         Requires X11/extensions/sync.h.
    34683729
    34693730 $XAN  -no-xinerama ....... Do not compile Xinerama (multihead) support.
    … …  
    35643825                          Example values for <arch>: arm mips x86 generic
    35653826
    3566     -armfpa ............. Target platform is uses the ARM-FPA floating point format.
     3827    -armfpa ............. Target platform uses the ARM-FPA floating point format.
    35673828    -no-armfpa .......... Target platform does not use the ARM-FPA floating point format.
    35683829
    … …  
    36373898                         (available on some XScale CPUs).
    36383899
     3900    -no-neon ........... Do not compile with use of NEON instructions.
    36393901EOF
    36403902fi
    … …  
    36683930    Platform="Qt for Embedded Linux"
    36693931elif [ "$PLATFORM_MAC" = "yes" ]; then
    3670     Platform="Qt/Mac"
     3932    Platform="Qt for Mac OS X"
    36713933else
    36723934    PLATFORM_X11=yes
    3673     Platform="Qt/X11"
     3935    Platform="Qt for Linux/X11"
    36743936fi
    36753937
    … …  
    36853947    while true; do
    36863948        echo "You are licensed to use this software under the terms of"
    3687         echo "the GNU General Public License (GPL) versions 3."
    3688         echo "You are also licensed to use this software under the terms of"
    36893949        echo "the Lesser GNU General Public License (LGPL) versions 2.1."
     3950        if [ -f "$relpath/LICENSE.GPL3" ]; then
     3951            echo "You are also licensed to use this software under the terms of"
     3952            echo "the GNU General Public License (GPL) versions 3."
     3953            affix="either"
     3954        else
     3955            affix="the"
     3956        fi
    36903957        echo
    3691         affix="either"
    36923958        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
    3693             echo "You have already accepted the terms of the $LicenseType license."
     3959            echo "You have already accepted the terms of the $LicenseType license."
    36943960            acceptance=yes
    36953961        else
    3696             echo "Type '3' to view the GNU General Public License version 3."
     3962            if [ -f "$relpath/LICENSE.GPL3" ]; then
     3963                echo "Type '3' to view the GNU General Public License version 3."
     3964            fi
    36973965            echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
    36983966            echo "Type 'yes' to accept this license offer."
    … …  
    37073975        fi
    37083976        echo
    3709         if [ "$acceptance" = "yes" ]; then
     3977        if [ "$acceptance" = "yes" ] || [ "$acceptance" = "y" ]; then
    37103978            break
    37113979        elif [ "$acceptance" = "no" ]; then
    … …  
    37674035                    echo
    37684036                    echo "  You are no longer licensed to use this version of Qt."
    3769                     echo "  Please contact sales@trolltech.com to renew your support"
     4037                    echo "  Please contact qt-info@nokia.com to renew your support"
    37704038                    echo "  and upgrades for this license."
    37714039                    echo
    … …  
    37854053                    echo "  Qt releases."
    37864054                    echo
    3787                     echo "  Please contact sales@trolltech.com to renew your"
     4055                    echo "  Please contact qt-info@nokia.com to renew your"
    37884056                    echo "  support and upgrades for this license."
    37894057                    echo
    … …  
    38004068                echo
    38014069                echo "  You are no longer licensed to use this software. Please"
    3802                 echo "  contact sales@trolltech.com to purchase license, or install"
     4070                echo "  contact qt-info@nokia.com to purchase license, or install"
    38034071                echo "  the Qt Open Source Edition if you intend to develop free"
    38044072                echo "  software."
    … …  
    38754143DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
    38764144
     4145TODAY=`date +%Y-%m-%d`
    38774146cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
    38784147/* License Info */
    38794148static const char qt_configure_licensee_str          [256 + 12] = "$LICENSE_USER_STR";
    38804149static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
     4150
     4151/* Installation date */
     4152static const char qt_configure_installation          [12+11]    = "qt_instdate=$TODAY";
    38814153EOF
     4154
    38824155
    38834156if [ ! -z "$QT_HOST_PREFIX" ]; then
    … …  
    39624235
    39634236# -----------------------------------------------------------------------------
     4237if [ "$LicenseType" = "Evaluation" ]; then
     4238    EVALKEY=`"$relpath/config.tests/unix/padstring" 524 "qt_qevalkey=$LicenseKeyExt"`
     4239elif echo "$D_FLAGS" | grep QT_EVAL >/dev/null 2>&1; then
     4240    EVALKEY=`"$relpath/config.tests/unix/padstring" 524 "qt_qevalkey="`
     4241fi
     4242
     4243if [ -n "$EVALKEY" ]; then
     4244    rm -f "$outpath/src/corelib/global/qconfig_eval.cpp"
     4245    cat > "$outpath/src/corelib/global/qconfig_eval.cpp" <<EOF
     4246/* Evaluation license key */
     4247static const char qt_eval_key_data                   [512 + 12] = "$EVALKEY";
     4248EOF
     4249    chmod -w "$outpath/src/corelib/global/qconfig_eval.cpp"
     4250fi
     4251
     4252
     4253# -----------------------------------------------------------------------------
    39644254# build qmake
    39654255# -----------------------------------------------------------------------------
    … …  
    39714261    if [ "$OPT_SHADOW" = "yes" ]; then
    39724262        "$outpath/bin/syncqt" $SYNCQT_OPTS
    3973     elif [ "$CFG_DEV" = "yes" ]; then
     4263    elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ]; then
    39744264        QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS
    39754265    fi
    … …  
    40564346        [ -f "$in_mkfile" ] || continue
    40574347
    4058         echo "########################################################################" >$mkfile
    4059         echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile
    4060         echo "########################################################################" >>$mkfile
     4348        echo "########################################################################" > "$mkfile"
     4349        echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
     4350        echo "########################################################################" >> "$mkfile"
    40614351        EXTRA_OBJS=
    40624352        EXTRA_SRCS=
    … …  
    40694359        fi
    40704360
    4071         [ -n "$CC" ] && echo "CC = $CC" >>$mkfile
    4072         [ -n "$CXX" ] && echo "CXX = $CXX" >>$mkfile
     4361        [ -n "$CC" ] && echo "CC = $CC" >> "$mkfile"
     4362        [ -n "$CXX" ] && echo "CXX = $CXX" >> "$mkfile"
    40734363        if [ "$CFG_SILENT" = "yes" ]; then
    40744364            [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,'
    … …  
    41054395        fi
    41064396        if [ "$PLATFORM_MAC" = "yes" ]; then
    4107             if [ "$PLATFORM" = "macx-icc" ]; then
    4108                 echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >>"$mkfile"
    4109             else
    4110                 echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile"
    4111             fi
     4397            echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >> "$mkfile"
    41124398            echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
    41134399            echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
    … …  
    41174403            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
    41184404            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
    4119             if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then
     4405            if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
    41204406                X86_CFLAGS="-arch i386"
    41214407                X86_LFLAGS="-arch i386"
    … …  
    41244410                EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
    41254411            fi
    4126             if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then
     4412            if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
    41274413                PPC_CFLAGS="-arch ppc"
    41284414                PPC_LFLAGS="-arch ppc"
    … …  
    41524438        adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
    41534439        adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
     4440        adjqmakespec=`echo "$QMAKESPEC" | sed 's/ /\\\\\\\\ /g'`
    41544441        sed -e "s,@SOURCE_PATH@,$adjrelpath,g" -e "s,@BUILD_PATH@,$adjoutpath,g" \
    41554442            -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
    … …  
    41584445            -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
    41594446            -e "s,@QMAKE_QTOBJS@,$EXTRA_OBJS,g" -e "s,@QMAKE_QTSRCS@,$EXTRA_SRCS,g" \
    4160             -e "s,@QMAKESPEC@,$QMAKESPEC,g" "$in_mkfile" >>"$mkfile"
     4447            -e "s,@QMAKESPEC@,$adjqmakespec,g" "$in_mkfile" >>"$mkfile"
    41614448
    41624449        if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
    41634450            (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
    4164             sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"${mkfile}.tmp"
    4165             mv "${mkfile}.tmp" "${mkfile}"
     4451            sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"$mkfile.tmp"
     4452            sed "s,$outpath,$adjoutpath,g" "$mkfile.tmp" >"$mkfile"
     4453            rm "$mkfile.tmp"
    41664454        fi
    41674455    done
    … …  
    42234511# check iWMMXt support
    42244512if [ "$CFG_IWMMXT" = "yes" ]; then
    4225     if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"; then
     4513    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
     4514    if [ $? != "0" ]; then
    42264515        echo "The iWMMXt functionality test failed!"
    42274516        echo " Please make sure your compiler supports iWMMXt intrinsics!"
    42284517        exit 1
     4518    fi
     4519fi
     4520
     4521# detect neon support
     4522if ([ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]) && [ "${CFG_NEON}" = "auto" ]; then
     4523    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/neon "neon" $L_FLAGS $I_FLAGS $l_FLAGS "-mfpu=neon"; then
     4524        CFG_NEON=yes
     4525    else
     4526        CFG_NEON=no
    42294527    fi
    42304528fi
    … …  
    42454543fi
    42464544if [ "$CFG_ZLIB" = "auto" ]; then
    4247     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4545    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    42484546       CFG_ZLIB=system
    42494547    else
    … …  
    42624560# detect jpeg
    42634561if [ "$CFG_LIBJPEG" = "auto" ]; then
    4264     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4562    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    42654563       CFG_LIBJPEG=system
    42664564    else
    … …  
    42894587# detect tiff
    42904588if [ "$CFG_LIBTIFF" = "auto" ]; then
    4291     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4589    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    42924590        CFG_LIBTIFF=system
    42934591    else
    … …  
    43064604# detect mng
    43074605if [ "$CFG_LIBMNG" = "auto" ]; then
    4308     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4606    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    43094607       CFG_LIBMNG=system
    43104608    else
    … …  
    43154613# detect png
    43164614if [ "$CFG_LIBPNG" = "auto" ]; then
    4317     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4615    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    43184616       CFG_LIBPNG=system
    43194617    else
    … …  
    43324630        mysql)
    43334631            if [ "$CFG_SQL_mysql" != "no" ]; then
    4334                 [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
     4632                [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
    43354633                if [ -x "$CFG_MYSQL_CONFIG" ]; then
    43364634                    QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
    … …  
    43544652                    fi
    43554653                else
    4356                     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
     4654                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    43574655                        QMakeVar add CONFIG use_libmysqlclient_r
    43584656                        if [ "$CFG_SQL_mysql" = "auto" ]; then
    … …  
    43604658                        fi
    43614659                        QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R"
    4362                     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
     4660                    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    43634661                        if [ "$CFG_SQL_mysql" = "auto" ]; then
    43644662                            CFG_SQL_mysql=plugin
    … …  
    43894687                [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
    43904688                [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
    4391                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then
     4689                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    43924690                    if [ "$CFG_SQL_psql" = "auto" ]; then
    43934691                        CFG_SQL_psql=plugin
    … …  
    44104708        odbc)
    44114709            if [ "$CFG_SQL_odbc" != "no" ]; then
    4412                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4710                if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    44134711                    if [ "$CFG_SQL_odbc" = "auto" ]; then
    44144712                        CFG_SQL_odbc=plugin
    44154713                    fi
    44164714                else
    4417                     if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
    4418                         echo "ODBC support cannot be enabled due to functionality tests!"
    4419                         echo " Turn on verbose messaging (-v) to $0 to see the final report."
    4420                         echo " If you believe this message is in error you may use the continue"
    4421                         echo " switch (-continue) to $0 to continue."
    4422                         exit 101
     4715                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iodbc "iODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
     4716                        QT_LFLAGS_ODBC="-liodbc"
     4717                        if [ "$CFG_SQL_odbc" = "auto" ]; then
     4718                            CFG_SQL_odbc=plugin
     4719                        fi
    44234720                    else
    4424                         CFG_SQL_odbc=no
     4721                        if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
     4722                            echo "ODBC support cannot be enabled due to functionality tests!"
     4723                            echo " Turn on verbose messaging (-v) to $0 to see the final report."
     4724                            echo " If you believe this message is in error you may use the continue"
     4725                            echo " switch (-continue) to $0 to continue."
     4726                            exit 101
     4727                        else
     4728                            CFG_SQL_odbc=no
     4729                        fi
    44254730                    fi
    44264731                fi
    … …  
    44294734        oci)
    44304735            if [ "$CFG_SQL_oci" != "no" ]; then
    4431                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4736                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    44324737                    if [ "$CFG_SQL_oci" = "auto" ]; then
    44334738                        CFG_SQL_oci=plugin
    … …  
    44484753        tds)
    44494754            if [ "$CFG_SQL_tds" != "no" ]; then
    4450                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4755                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    44514756                    if [ "$CFG_SQL_tds" = "auto" ]; then
    44524757                        CFG_SQL_tds=plugin
    … …  
    44674772        db2)
    44684773            if [ "$CFG_SQL_db2" != "no" ]; then
    4469                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4774                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    44704775                    if [ "$CFG_SQL_db2" = "auto" ]; then
    44714776                        CFG_SQL_db2=plugin
    … …  
    44864791        ibase)
    44874792            if [ "$CFG_SQL_ibase" != "no" ]; then
    4488                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4793                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    44894794                    if [ "$CFG_SQL_ibase" = "auto" ]; then
    44904795                        CFG_SQL_ibase=plugin
    … …  
    45054810        sqlite2)
    45064811            if [ "$CFG_SQL_sqlite2" != "no" ]; then
    4507                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4812                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    45084813                    if [ "$CFG_SQL_sqlite2" = "auto" ]; then
    45094814                        CFG_SQL_sqlite2=plugin
    … …  
    45304835                        QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
    45314836                    fi
    4532                     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
     4837                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    45334838                        if [ "$CFG_SQL_sqlite" = "auto" ]; then
    45344839                            CFG_SQL_sqlite=plugin
    … …  
    45674872# auto-detect NIS support
    45684873if [ "$CFG_NIS" != "no" ]; then
    4569     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4874    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    45704875        CFG_NIS=yes
    45714876    else
    … …  
    45844889# auto-detect CUPS support
    45854890if [ "$CFG_CUPS" != "no" ]; then
    4586     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4891    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    45874892        CFG_CUPS=yes
    45884893    else
    … …  
    46034908    if [ "$PLATFORM_QWS" = "yes" ]; then
    46044909        CFG_ICONV=no
    4605     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4910    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    46064911        CFG_ICONV=yes
    4607     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4912    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    46084913        CFG_ICONV=gnu
    46094914    else
    … …  
    46264931        QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
    46274932    fi
    4628     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then
     4933    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS $MAC_CONFIG_TEST_COMMANDLINE; then
    46294934        [ "$CFG_DBUS" = "auto" ] && CFG_DBUS=yes
    46304935        QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
    … …  
    46534958
    46544959if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
     4960
     4961    # detect EGL support
     4962    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4963        # EGL specified by QMAKE_*_EGL, included with <EGL/egl.h>
     4964        CFG_EGL=yes
     4965        CFG_EGL_GLES_INCLUDES=no
     4966    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
     4967        # EGL specified by QMAKE_*_EGL, included with <GLES/egl.h>
     4968        CFG_EGL=yes
     4969        CFG_EGL_GLES_INCLUDES=yes
     4970    fi
     4971    if ( [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ] ) && [ "$CFG_EGL" != "yes" ]; then
     4972        echo "The EGL functionality test failed!"
     4973        echo " EGL is required for OpenGL ES to manage contexts & surfaces."
     4974        echo " You might need to modify the include and library search paths by editing"
     4975        echo " QMAKE_INCDIR_EGL, QMAKE_LIBDIR_EGL and QMAKE_LIBS_EGL in"
     4976        echo " ${XQMAKESPEC}."
     4977        exit 1
     4978    fi
     4979
     4980
    46554981    # auto-detect Glib support
    46564982    if [ "$CFG_GLIB" != "no" ]; then
    … …  
    46594985            QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
    46604986        fi
    4661         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then
     4987        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS ; then
    46624988            CFG_GLIB=yes
    46634989            QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB"
    … …  
    47355061
    47365062    # Check we actually have X11 :-)
    4737     if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
     5063    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
     5064    if [ $? != "0" ]; then
    47385065        echo "Basic XLib functionality test failed!"
    47395066        echo " You might need to modify the include and library search paths by editing"
    … …  
    47665093           # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
    47675094           if [ "$CFG_OPENGL" = "desktop" ]; then
    4768                if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
     5095               "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
     5096               if [ $? != "0" ]; then
    47695097                   QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
    47705098               fi
    … …  
    47765104    elif [ "$CFG_OPENGL" = "es1cl" ]; then
    47775105        # OpenGL ES 1.x common lite
    4778         if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5106        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS
     5107        if [ $? != "0" ]; then
    47795108            echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!"
    47805109            echo " You might need to modify the include and library search paths by editing"
    4781             echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
    4782             echo " ${XQMAKESPEC}."
     5110            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
     5111            echo " ${XQMAKESPEC}."
    47835112            exit 1
    47845113        fi
    47855114    elif [ "$CFG_OPENGL" = "es1" ]; then
    47865115        # OpenGL ES 1.x
    4787         if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5116        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS
     5117        if [ $? != "0" ]; then
    47885118            echo "The OpenGL ES 1.x functionality test failed!"
    47895119            echo " You might need to modify the include and library search paths by editing"
    4790             echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
    4791             echo " ${XQMAKESPEC}."
     5120            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
     5121            echo " ${XQMAKESPEC}."
    47925122            exit 1
    47935123        fi
    47945124    elif [ "$CFG_OPENGL" = "es2" ]; then
    47955125        #OpenGL ES 2.x
    4796         if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5126        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
     5127        if [ $? != "0" ]; then
    47975128            echo "The OpenGL ES 2.0 functionality test failed!"
    47985129            echo " You might need to modify the include and library search paths by editing"
    4799             echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
    4800             echo " ${XQMAKESPEC}."
     5130            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
     5131            echo " ${XQMAKESPEC}."
    48015132            exit 1
    48025133        fi
    48035134    elif [ "$CFG_OPENGL" = "desktop" ]; then
    48045135        # Desktop OpenGL support
    4805         if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
     5136        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
     5137        if [ $? != "0" ]; then
    48065138            echo "The OpenGL functionality test failed!"
    48075139            echo " You might need to modify the include and library search paths by editing"
    4808             echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
    4809             echo " ${XQMAKESPEC}."
     5140            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
     5141            echo " ${XQMAKESPEC}."
    48105142            exit 1
    48115143        fi
    … …  
    48135145        hpux*)
    48145146            # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
    4815             if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
     5147            "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
     5148            if [ $? != "0" ]; then
    48165149                QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
    48175150            fi
    … …  
    49215254    # auto-detect FontConfig support
    49225255    if [ "$CFG_FONTCONFIG" != "no" ]; then
    4923     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig 2>/dev/null; then
    4924         QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig 2>/dev/null`
    4925         QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig 2>/dev/null`
     5256    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then
     5257        QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null`
     5258        QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null`
    49265259    else
    49275260        QT_CFLAGS_FONTCONFIG=
    … …  
    49765309            else
    49775310                CFG_XSHAPE=no
     5311            fi
     5312        fi
     5313    fi
     5314
     5315    # auto-detect XSync support
     5316    if [ "$CFG_XSYNC" != "no" ]; then
     5317        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xsync "XSync" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
     5318            CFG_XSYNC=yes
     5319        else
     5320            if [ "$CFG_XSYNC" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
     5321                echo "XSync support cannot be enabled due to functionality tests!"
     5322                echo " Turn on verbose messaging (-v) to $0 to see the final report."
     5323                echo " If you believe this message is in error you may use the continue"
     5324                echo " switch (-continue) to $0 to continue."
     5325                exit 101
     5326            else
     5327                CFG_XSYNC=no
    49785328            fi
    49795329        fi
    … …  
    50885438    elif [ "$CFG_OPENGL" = "es1" ]; then
    50895439        # OpenGL ES 1.x
    5090         if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5440        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS
     5441        if [ $? != "0" ]; then
    50915442            echo "The OpenGL ES 1.x functionality test failed!"
    50925443            echo " You might need to modify the include and library search paths by editing"
    … …  
    50975448    elif [ "$CFG_OPENGL" = "es2" ]; then
    50985449        #OpenGL ES 2.x
    5099         if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5450        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
     5451        if [ $? != "0" ]; then
    51005452            echo "The OpenGL ES 2.0 functionality test failed!"
    51015453            echo " You might need to modify the include and library search paths by editing"
    … …  
    51135465    for screen in ${CFG_GFX_ON} ${CFG_GFX_PLUGIN}; do
    51145466       if [ "${screen}" = "ahi" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
    5115            if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/ahi "Ahi" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5467           "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/ahi "Ahi" $L_FLAGS $I_FLAGS $l_FLAGS
     5468           if [ $? != "0" ]; then
    51165469               echo "The Ahi screen driver functionality test failed!"
    51175470               echo " You might need to modify the include and library search paths by editing"
    … …  
    51235476
    51245477       if [ "${screen}" = "svgalib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
    5125            if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/svgalib "SVGAlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5478           "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/svgalib "SVGAlib" $L_FLAGS $I_FLAGS $l_FLAGS
     5479           if [ $? != "0" ]; then
    51265480               echo "The SVGAlib screen driver functionality test failed!"
    51275481               echo " You might need to modify the include and library search paths by editing"
    … …  
    51485502               QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB"
    51495503           fi
    5150 
    5151            if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB; then
     5504           if [ "$CFG_QT3SUPPORT" = "yes" ]; then
     5505               QMakeVar set QT_DEFINES_DIRECTFB "QT3_SUPPORT"
     5506           fi
     5507
     5508           "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB
     5509           if [ $? != "0" ]; then
    51525510               echo "The DirectFB screen driver functionality test failed!"
    51535511               echo " You might need to modify the include and library search paths by editing"
    … …  
    51635521    for mouse in ${CFG_MOUSE_ON} ${CFG_MOUSE_PLUGIN}; do
    51645522        if [ "${mouse}" = "tslib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
    5165             if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5523            "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS
     5524            if [ $? != "0" ]; then
    51665525               echo "The tslib functionality test failed!"
    51675526               echo " You might need to modify the include and library search paths by editing"
    … …  
    51765535
    51775536    # sound
    5178     if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/sound "sound" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5537    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/sound "sound" $L_FLAGS $I_FLAGS $l_FLAGS
     5538    if [ $? != "0" ]; then
    51795539        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SOUND"
    51805540    fi
    … …  
    51865546[ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no
    51875547if [ "$CFG_LIBFREETYPE" = "auto" ]; then
    5188     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then
     5548    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    51895549        CFG_LIBFREETYPE=system
    51905550    else
    … …  
    53035663# find if the platform supports IPv6
    53045664if [ "$CFG_IPV6" != "no" ]; then
    5305     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5665    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    53065666        CFG_IPV6=yes
    53075667    else
    … …  
    54345794# detect OpenSSL
    54355795if [ "$CFG_OPENSSL" != "no" ]; then
    5436     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5796    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
    54375797        if [ "$CFG_OPENSSL" = "auto" ]; then
    54385798            CFG_OPENSSL=yes
    … …  
    54515811fi
    54525812
     5813# detect OpenVG support
     5814if [ "$CFG_OPENVG" != "no" ]; then
     5815    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
     5816        if [ "$CFG_OPENVG" = "auto" ]; then
     5817            CFG_OPENVG=yes
     5818        fi
     5819    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG openvg_on_opengl" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
     5820        if [ "$CFG_OPENVG" = "auto" ]; then
     5821            CFG_OPENVG=yes
     5822        fi
     5823        CFG_OPENVG_ON_OPENGL=yes
     5824    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG lower_case_includes" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG (lc includes)" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
     5825        if [ "$CFG_OPENVG" = "auto" ]; then
     5826            CFG_OPENVG=yes
     5827        fi
     5828        CFG_OPENVG_LC_INCLUDES=yes
     5829    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG openvg_on_opengl lower_case_includes" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG (lc includes)" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
     5830        if [ "$CFG_OPENVG" = "auto" ]; then
     5831            CFG_OPENVG=yes
     5832        fi
     5833        CFG_OPENVG_LC_INCLUDES=yes
     5834        CFG_OPENVG_ON_OPENGL=yes
     5835    else
     5836        if [ "$CFG_OPENVG" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
     5837            echo "$CFG_OPENVG was specified for OpenVG but cannot be enabled due to functionality tests!"
     5838            echo " Turn on verbose messaging (-v) to $0 to see the final report."
     5839            echo " If you believe this message is in error you may use the continue"
     5840            echo " switch (-continue) to $0 to continue."
     5841            exit 101
     5842        else
     5843            CFG_OPENVG=no
     5844        fi
     5845    fi
     5846    if [ "$CFG_OPENVG" = "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/shivavg" "ShivaVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
     5847        CFG_OPENVG_SHIVA=yes
     5848    fi
     5849fi
     5850
     5851# if openvg is disabled and the user specified graphicssystem vg, disable it...
     5852if [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && [ "$CFG_OPENVG" = "no" ]; then
     5853    echo "OpenVG Graphics System is disabled due to missing OpenVG support..."
     5854    CFG_GRAPHICS_SYSTEM=default
     5855fi
     5856
    54535857if [ "$CFG_PTMALLOC" != "no" ]; then
    54545858    # build ptmalloc, copy .a file to lib/
    … …  
    54585862
    54595863    QMakeVar add QMAKE_LFLAGS "$outpath/lib/libptmalloc3.a"
     5864fi
     5865
     5866if [ "$CFG_ALSA" = "auto" ]; then
     5867    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/alsa "alsa" $L_FLAGS $I_FLAGS $l_FLAGS; then
     5868        CFG_ALSA=yes
     5869    else
     5870        CFG_ALSA=no
     5871    fi
     5872fi
     5873
     5874if [ -f "$relpath/src/declarative/declarative.pro" ]; then
     5875    if [ "$CFG_DECLARATIVE" = "auto" ]; then
     5876        CFG_DECLARATIVE=yes
     5877    fi
     5878else
     5879    if [ "$CFG_DECLARATIVE" = "auto" ] || [ "$CFG_DECLARATIVE" = "no" ]; then
     5880        CFG_DECLARATIVE=no
     5881    else
     5882        echo "Error: Unable to locate the qt-declarative package. Refer to the documentation on how to build the package."
     5883        exit 1
     5884    fi
     5885fi
     5886
     5887if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
     5888    if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
     5889       "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/javascriptcore-jit "javascriptcore-jit" $L_FLAGS $I_FLAGS $l_FLAGS
     5890        if [ $? != "0" ]; then
     5891           CFG_JAVASCRIPTCORE_JIT=no
     5892        fi
     5893    fi
     5894fi
     5895
     5896if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ]; then
     5897    QMakeVar set JAVASCRIPTCORE_JIT yes
     5898elif [ "$CFG_JAVASCRIPTCORE_JIT" = "no" ]; then
     5899    QMakeVar set JAVASCRIPTCORE_JIT no
    54605900fi
    54615901
    … …  
    55035943fi
    55045944
    5505 # Set the default arch. Select 32-bit/carbon if nothing else has
    5506 # been specified on the configure line.
    5507 if [ "$PLATFORM_MAC" = "yes" ]  && [ "$CFG_MAC_ARCHS" == "" ]; then
     5945# Set the default arch.
     5946# Carbon builds: 32 bit x86/ppc.
     5947# For "-cocoa" builds on snow leopard : compiler default (64-bit).
     5948# For "-cocoa" builds on leopard : compiler default (32-bit).
     5949if [ "$PLATFORM_MAC" = "yes" ]  && [ "$CFG_MAC_ARCHS" = "" ]; then
    55085950    source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
    55095951
    5510     if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then
    5511         CFG_MAC_ARCHS=" x86"
    5512     elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then
    5513         CFG_MAC_ARCHS=" ppc"
    5514     else
    5515         CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH"
    5516     fi
    5517 
    5518     [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
     5952        if [ "$CFG_MAC_COCOA" != "yes" ]; then
     5953                if [ "$QT_MAC_DEFAULT_ARCH" = "x86_64" ]; then
     5954                        CFG_MAC_ARCHS=" x86"
     5955                elif [ "$QT_MAC_DEFAULT_ARCH" = "ppc64" ]; then
     5956                        CFG_MAC_ARCHS=" ppc"
     5957                else
     5958                        CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
     5959                fi
     5960        else
     5961                CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
     5962    fi
     5963
     5964    [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
    55195965fi
    55205966
    … …  
    55405986fi;
    55415987
    5542 # set the global Mac deployment target. This is overridden on an arch-by-arch basis 
     5988# set the global Mac deployment target. This is overridden on an arch-by-arch basis
    55435989# in some cases, see code further down
    55445990case "$PLATFORM,$CFG_MAC_COCOA" in
    … …  
    55465992        # Cocoa
    55475993        QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
    5548         CFG_QT3SUPPORT="no"
    5549         ;;
    5550     macx-icc,*)
    5551         # Intel CC, Carbon
    5552         QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
    55535994        ;;
    55545995    macx*,no)
    55555996        # gcc, Carbon
    5556         QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.3
     5997        QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
    55575998        ;;
     5999esac
     6000
     6001# disable Qt 3 support on VxWorks
     6002case "$XPLATFORM" in
     6003    unsupported/vxworks*)
     6004        CFG_QT3SUPPORT="no"
     6005    ;;
    55586006esac
    55596007
    … …  
    55786026else
    55796027    QT_CONFIG="$QT_CONFIG accessibility"
     6028fi
     6029
     6030# enable egl
     6031if [ "$CFG_EGL" = "no" ]; then
     6032    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EGL"
     6033else
     6034    QT_CONFIG="$QT_CONFIG egl"
     6035    if [ "$CFG_EGL_GLES_INCLUDES" = "yes" ]; then
     6036        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GLES_EGL"
     6037    fi
     6038fi
     6039
     6040# enable openvg
     6041if [ "$CFG_OPENVG" = "no" ]; then
     6042    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENVG"
     6043else
     6044    QT_CONFIG="$QT_CONFIG openvg"
     6045    if [ "$CFG_OPENVG_LC_INCLUDES" = "yes" ]; then
     6046        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LOWER_CASE_VG_INCLUDES"
     6047    fi
     6048    if [ "$CFG_OPENVG_ON_OPENGL" = "yes" ]; then
     6049        QT_CONFIG="$QT_CONFIG openvg_on_opengl"
     6050    fi
     6051    if [ "$CFG_OPENVG_SHIVA" = "yes" ]; then
     6052        QT_CONFIG="$QT_CONFIG shivavg"
     6053        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SHIVAVG"
     6054    fi
    55806055fi
    55816056
    … …  
    56606135    QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info"
    56616136fi
     6137if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then
     6138    QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info_nocopy"
     6139fi
    56626140[ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx"
    56636141[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
    … …  
    56656143[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
    56666144[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
     6145[ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
    56676146[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
    56686147if [ "$CFG_IPV6" = "yes" ]; then
    … …  
    56906169    QT_CONFIG="$QT_CONFIG inotify"
    56916170fi
    5692 if [ "$CFG_LIBJPEG" = "system" ]; then
     6171if [ "$CFG_LIBJPEG" = "no" ]; then
     6172    CFG_JPEG="no"
     6173elif [ "$CFG_LIBJPEG" = "system" ]; then
    56936174    QT_CONFIG="$QT_CONFIG system-jpeg"
    56946175fi
    … …  
    56986179    QT_CONFIG="$QT_CONFIG jpeg"
    56996180fi
    5700 if [ "$CFG_LIBMNG" = "system" ]; then
     6181if [ "$CFG_LIBMNG" = "no" ]; then
     6182    CFG_MNG="no"
     6183elif [ "$CFG_LIBMNG" = "system" ]; then
    57016184    QT_CONFIG="$QT_CONFIG system-mng"
    57026185fi
    … …  
    57226205    QT_CONFIG="$QT_CONFIG gif"
    57236206fi
    5724 if [ "$CFG_LIBTIFF" = "system" ]; then
     6207if [ "$CFG_LIBTIFF" = "no" ]; then
     6208    CFG_TIFF="no"
     6209elif [ "$CFG_LIBTIFF" = "system" ]; then
    57256210    QT_CONFIG="$QT_CONFIG system-tiff"
    57266211fi
    … …  
    57696254        QT_CONFIG="$QT_CONFIG xshape"
    57706255    fi
     6256    if [ "$CFG_XSYNC" = "yes" ]; then
     6257        QT_CONFIG="$QT_CONFIG xsync"
     6258    fi
    57716259    if [ "$CFG_XINERAMA" = "yes" ]; then
    57726260        QT_CONFIG="$QT_CONFIG xinerama"
    … …  
    58616349fi
    58626350
     6351if [ "$CFG_ALSA" = "yes" ]; then
     6352    QT_CONFIG="$QT_CONFIG alsa"
     6353fi
     6354
    58636355#
    58646356# Some Qt modules are too advanced in C++ for some old compilers
    … …  
    58706362canBuildQtXmlPatterns="yes"
    58716363canBuildWebKit="$HAVE_STL"
     6364canBuildQtConcurrent="yes"
    58726365
    58736366# WebKit requires stdint.h
    … …  
    58966389        esac
    58976390        ;;
     6391    unsupported/vxworks-*-g++*)
     6392        canBuildWebKit="no"
     6393        ;;
     6394    unsupported/vxworks-*-dcc*)
     6395        canBuildWebKit="no"
     6396        canBuildQtXmlPatterns="no"
     6397        ;;
    58986398    *-g++*)
    58996399        # Check gcc's version
    … …  
    59016401            4*|3.4*)
    59026402                ;;
    5903             3.3*)
    5904                 canBuildWebKit="no"
    5905                 ;;
     6403            3.3*)
     6404                canBuildWebKit="no"
     6405                ;;
    59066406            *)
    59076407                canBuildWebKit="no"
    … …  
    59116411        ;;
    59126412    solaris-cc*)
    5913         # Check the compiler version
    5914         case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
    5915             *)
    5916                 canBuildWebKit="no"
    5917                 canBuildQtXmlPatterns="no"
    5918                 ;;
    5919         esac
    5920         ;;
     6413        # Check the compiler version
     6414        case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
     6415            5.[012345678])
     6416                canBuildWebKit="no"
     6417                canBuildQtXmlPatterns="no"
     6418                canBuildQtConcurrent="no"
     6419                ;;
     6420            5.9)
     6421                canBuildWebKit="no"
     6422                canBuildQtConcurrent="no"
     6423                ;;
     6424        esac
     6425        ;;
    59216426    hpux-acc*)
    59226427        canBuildWebKit="no"
    59236428        canBuildQtXmlPatterns="no"
     6429        canBuildQtConcurrent="no"
    59246430        ;;
    59256431    hpuxi-acc*)
    … …  
    59276433        ;;
    59286434    aix-xlc*)
    5929         canBuildWebKit="no"
    5930         canBuildQtXmlPatterns="no"
    5931         ;;
     6435        # Get the xlC version
     6436        cat > xlcver.c <<EOF
     6437#include <stdio.h>
     6438int main()
     6439{
     6440    printf("%d.%d\n", __xlC__ >> 8, __xlC__ & 0xFF);
     6441    return 0;
     6442}
     6443EOF
     6444        xlcver=
     6445        if ${QMAKE_CONF_COMPILER} -o xlcver xlcver.c >/dev/null 2>/dev/null; then
     6446            xlcver=`./xlcver 2>/dev/null`
     6447            rm -f ./xlcver
     6448        fi
     6449        if [ "$OPT_VERBOSE" = "yes" ]; then
     6450            if [ -n "$xlcver" ]; then
     6451                echo Found IBM xlC version: $xlcver.
     6452            else
     6453                echo Could not determine IBM xlC version, assuming oldest supported.
     6454            fi
     6455        fi
     6456
     6457        case "$xlcver" in
     6458            [123456].*)
     6459                canBuildWebKit="no"
     6460                canBuildQtXmlPatterns="no"
     6461                canBuildQtConcurrent="no"
     6462                ;;
     6463            *)
     6464                canBuildWebKit="no"
     6465                canBuildQtConcurrent="no"
     6466                ;;
     6467        esac
     6468        ;;
    59326469    irix-cc*)
    59336470        canBuildWebKit="no"
     6471        canBuildQtConcurrent="no"
    59346472        ;;
    59356473esac
     6474
     6475CFG_CONCURRENT="yes"
     6476if [ "$canBuildQtConcurrent" = "no" ]; then
     6477    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
     6478    CFG_CONCURRENT="no"
     6479fi
    59366480
    59376481if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
    … …  
    59506494fi
    59516495
     6496if [ "$CFG_MULTIMEDIA" = "no" ]; then
     6497    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
     6498else
     6499    QT_CONFIG="$QT_CONFIG multimedia"
     6500fi
     6501
     6502if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
     6503    QT_CONFIG="$QT_CONFIG audio-backend"
     6504fi
     6505
    59526506if [ "$CFG_SVG" = "yes" ]; then
    59536507    QT_CONFIG="$QT_CONFIG svg"
    59546508else
    59556509    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"
     6510fi
     6511
     6512if [ "$CFG_DECLARATIVE" = "yes" ]; then
     6513    QT_CONFIG="$QT_CONFIG declarative"
     6514else
     6515    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DECLARATIVE"
    59566516fi
    59576517
    … …  
    59696529fi
    59706530
    5971 if [ "$CFG_SCRIPTTOOLS" = "auto" ]; then
     6531if [ "$CFG_SCRIPT" = "auto" ]; then
     6532    CFG_SCRIPT="yes"
     6533fi
     6534
     6535if [ "$CFG_SCRIPT" = "yes" ]; then
     6536    QT_CONFIG="$QT_CONFIG script"
     6537else
     6538    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
     6539fi
     6540
     6541if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then
     6542    echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled."
     6543    exit 1
     6544fi
     6545if [ "$CFG_SCRIPTTOOLS" = "auto" -a "$CFG_SCRIPT" != "no" ]; then
    59726546    CFG_SCRIPTTOOLS="yes"
     6547elif [ "$CFG_SCRIPT" = "no" ]; then
     6548    CFG_SCRIPTTOOLS="no"
    59736549fi
    59746550
    59756551if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
    59766552    QT_CONFIG="$QT_CONFIG scripttools"
    5977     CFG_SCRIPTTOOLS="yes"
    59786553else
    59796554    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
    … …  
    60026577fi
    60036578
    6004 # On Mac, set the minimum deployment target using Xarch when that is supported (10.5 and up).
    6005 # On 10.4 the deployment version is set to 10.3 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET env. variable
    6006 # "-cocoa" on the command line means Cocoa is used in 32-bit mode also, in this case fall back on
    6007 # QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5.
     6579# On Mac, set the minimum deployment target for the different architechtures
     6580# using the Xarch compiler option when supported (10.5 and up).  On 10.4 the
     6581# deployment version is set to 10.4 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET
     6582# env. variable. "-cocoa" on the command line means Cocoa is used in 32-bit mode also,
     6583# in this case fall back on QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5.
    60086584if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] && [ "$COMMANDLINE_MAC_COCOA" != "yes" ]; then
    60096585    if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
    … …  
    60146590    fi
    60156591    if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
    6016         QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
    6017         QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
    6018         QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
    6019         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.3"
     6592        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
     6593        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
     6594        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
     6595        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
    60206596    fi
    60216597    if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
    … …  
    60876663#     network canvas table xml opengl sql
    60886664#
    6089 #   Options:
     6665# Things that do not affect the Qt API/ABI:
    60906666#     stl
    6091 #
    6092 # Things that do not affect the Qt API/ABI:
    60936667#     system-jpeg no-jpeg jpeg
    60946668#     system-mng no-mng mng
    … …  
    61006674#     dll staticlib
    61016675#
    6102 #     internal
    61036676#     nocrosscompiler
    61046677#     GNUmake
    … …  
    61126685#     Embedded: embedded freetype
    61136686#
    6114 ALL_OPTIONS="stl"
     6687ALL_OPTIONS=
    61156688BUILD_CONFIG=
    61166689BUILD_OPTIONS=
    … …  
    61246697        # and is the one that we will use for tagging plugins
    61256698        BUILD_CONFIG="$config_option"
    6126         ;;
    6127 
    6128     stl)
    6129         # these config options affect the Qt API/ABI. they should influence
    6130         # the generation of the buildkey, so we don't skip them
    6131         SKIP="no"
    61326699        ;;
    61336700
    … …  
    64517018    [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
    64527019    [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL"
     7020    [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENVG"
    64537021fi
    64547022
    … …  
    64807048[ "$CFG_MITSHM" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM"
    64817049[ "$CFG_XSHAPE" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE"
     7050[ "$CFG_XSYNC" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC"
    64827051[ "$CFG_XINPUT" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET"
    64837052
    … …  
    64877056[ "$CFG_XRANDR" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR"
    64887057[ "$CFG_XINPUT" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT"
     7058[ "$CFG_ALSA" = "no" ]           && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA"
    64897059
    64907060# sort QCONFIG_FLAGS for neatness if we can
    … …  
    65807150    QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS"
    65817151fi
     7152if [ "$CFG_DEV" = "yes" ]; then
     7153    QT_CONFIG="$QT_CONFIG private_tests"
     7154fi
    65827155
    65837156# Make the application arch follow the Qt arch for single arch builds.
    … …  
    66467219EOF
    66477220
     7221# Ensure we can link to uninistalled libraries
     7222if linkerSupportsFlag -rpath-link "$outpath/lib"; then
     7223    echo "QMAKE_LFLAGS    += -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp"
     7224fi
     7225
    66487226if [ -n "$QT_CFLAGS_PSQL" ]; then
    66497227    echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp"
    … …  
    66637241if [ -n "$QT_LFLAGS_SQLITE" ]; then
    66647242    echo "QT_LFLAGS_SQLITE   = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp"
     7243fi
     7244if [ -n "$QT_LFLAGS_ODBC" ]; then
     7245    echo "QT_LFLAGS_ODBC   = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp"
    66657246fi
    66667247
    … …  
    67637344esac
    67647345
    6765 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ]  && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then
     7346if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ]  && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
    67667347    cat <<EOF
    67677348        WARNING: DWARF2 debug symbols are not enabled. Linking webkit
    … …  
    68367417[ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module ....... yes (run-time)"
    68377418[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)"
     7419echo "QtConcurrent code.... $CFG_CONCURRENT"
     7420echo "QtScript module ..... $CFG_SCRIPT"
    68387421echo "QtScriptTools module  $CFG_SCRIPTTOOLS"
    68397422echo "QtXmlPatterns module  $CFG_XMLPATTERNS"
    68407423echo "Phonon module ....... $CFG_PHONON"
     7424echo "Multimedia module ... $CFG_MULTIMEDIA"
    68417425echo "SVG module .......... $CFG_SVG"
    68427426echo "WebKit module ....... $CFG_WEBKIT"
     7427if [ "$CFG_WEBKIT" = "yes" ]; then
     7428    if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
     7429        echo "JavaScriptCore JIT .. To be decided by JavaScriptCore"
     7430    else
     7431        echo "JavaScriptCore JIT .. $CFG_JAVASCRIPTCORE_JIT"
     7432    fi
     7433fi
     7434echo "Declarative module .. $CFG_DECLARATIVE"
    68437435echo "STL support ......... $CFG_STL"
    68447436echo "PCH support ......... $CFG_PRECOMPILE"
    68457437echo "MMX/3DNOW/SSE/SSE2..  ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
    6846 if [ "${CFG_ARCH}" = "arm" ]; then
     7438if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
    68477439    echo "iWMMXt support ...... ${CFG_IWMMXT}"
     7440    echo "NEON support ........ ${CFG_NEON}"
    68487441fi
    68497442[ "${PLATFORM_QWS}" != "yes" ] && echo "Graphics System ..... $CFG_GRAPHICS_SYSTEM"
    … …  
    69187511    echo "OpenGL support ...... no"
    69197512fi
     7513if [ "$CFG_EGL" != "no" ]; then
     7514    if [ "$CFG_EGL_GLES_INCLUDES" != "no" ]; then
     7515        echo "EGL support ......... yes <GLES/egl.h>"
     7516    else
     7517        echo "EGL support ......... yes <EGL/egl.h>"
     7518    fi
     7519fi
     7520if [ "$CFG_OPENVG" ]; then
     7521    if [ "$CFG_OPENVG_SHIVA" = "yes" ]; then
     7522        echo "OpenVG support ...... ShivaVG"
     7523    else
     7524        echo "OpenVG support ...... $CFG_OPENVG"
     7525    fi
     7526fi
    69207527if [ "$PLATFORM_X11" = "yes" ]; then
    69217528    echo "NAS sound support ... $CFG_NAS"
    69227529    echo "XShape support ...... $CFG_XSHAPE"
     7530    echo "XSync support ....... $CFG_XSYNC"
    69237531    echo "Xinerama support .... $CFG_XINERAMA"
    69247532    echo "Xcursor support ..... $CFG_XCURSOR"
    … …  
    69747582    echo
    69757583fi
     7584echo "alsa support ........ $CFG_ALSA"
    69767585echo
    69777586
    … …  
    70187627FNR == 1 {
    70197628    if ( input_file ) {
    7020   if ( ! target_file )
    7021       target_file = third
    7022   print input_file >target_file
     7629        if ( ! target_file )
     7630            target_file = third
     7631        print input_file >target_file
    70237632    }
    70247633
    … …  
    70317640/^(TARGET.*=)/ {
    70327641    if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
    7033   target_file = first
     7642        target_file = first
     7643        matched_target = 1
     7644    } else if ( \$3 == "lrelease" || \$3 == "qm_phony_target" ) {
     7645        target_file = second
    70347646        matched_target = 1
    70357647    }
    … …  
    70387650matched_target == 0 && /^(TEMPLATE.*=)/ {
    70397651    if ( \$3 == "subdirs" )
    7040   target_file = second
     7652        target_file = second
    70417653    else if ( \$3 == "lib" )
    7042   template_lib = 1
    7043     else
    7044   target_file = third
     7654        template_lib = 1
     7655    else
     7656        target_file = third
    70457657}
    70467658
    … …  
    70497661        target_file = third
    70507662    else
    7051   target_file = second
     7663        target_file = second
    70527664}
    70537665
    70547666END {
    70557667    if ( input_file ) {
    7056   if ( ! target_file )
    7057       target_file = third
    7058   print input_file >>target_file
     7668        if ( ! target_file )
     7669            target_file = third
     7670        print input_file >>target_file
    70597671    }
    70607672}
    … …  
    71177729    tools) PART_ROOTS="$PART_ROOTS tools" ;;
    71187730    libs) PART_ROOTS="$PART_ROOTS src" ;;
     7731    translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
    71197732    examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
    71207733    *) ;;
    … …  
    71417754        case $a in
    71427755        *winmain/winmain.pro) continue ;;
     7756        *s60main/s60main.pro) continue ;;
     7757        *examples/activeqt/*) continue ;;
    71437758        */qmake/qmake.pro) continue ;;
    7144         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
     7759        *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
    71457760        *) SPEC=$XQMAKESPEC ;;
    71467761        esac
    7147         dir=`dirname $a | sed -e "s;$sepath;.;g"`
     7762        dir=`dirname "$a" | sed -e "s;$sepath;.;g"`
    71487763        test -d "$dir" || mkdir -p "$dir"
    71497764        OUTDIR="$outpath/$dir"
    … …  
    72887903fi
    72897904
    7290 MAKE=`basename $MAKE`
     7905MAKE=`basename "$MAKE"`
    72917906echo
    72927907echo Qt is now configured for building. Just run \'$MAKE\'.
Note: See TracChangeset for help on using the changeset viewer.