Changeset 769 for trunk/configure


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/configure

    r651 r769  
    174174UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    175175
     176# detect the "echo without newline" style. usage: echo $ECHO_N "<string>$ECHO_C"
     177if echo '\c' | grep '\c' >/dev/null; then
     178    ECHO_N=-n
     179else
     180    ECHO_C='\c'
     181fi
    176182
    177183#-------------------------------------------------------------------------------
    … …  
    400406        if [ -z "$LicenseKeyExt" ]; then
    401407            echo
    402             if echo '\c' | grep '\c' >/dev/null; then
    403                 echo -n "Please enter your license key: "
    404             else
    405                 echo "Please enter your license key: \c"
    406             fi
     408            echo $ECHO_N "Please enter your license key: $ECHO_C"
    407409            read LicenseKeyExt
    408410            Licensee="Unknown user"
    … …  
    33703372                         debugging turned on (Mac only).
    33713373
    3372     -developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting)
    3373 
    3374     -opensource......... Compile and link the Open-Source Edition of Qt.
    3375     -commercial......... Compile and link the Commercial Edition of Qt.
     3374    -developer-build ... Compile and link Qt with Qt developer options (including auto-tests exporting)
     3375
     3376    -opensource ........ Compile and link the Open-Source Edition of Qt.
     3377    -commercial ........ Compile and link the Commercial Edition of Qt.
    33763378
    33773379
    … …  
    37663768                         freetype.h and libfreetype.
    37673769
    3768  $XIN  -no-xinput.......... Do not compile Xinput support.
     3770 $XIN  -no-xinput ......... Do not compile Xinput support.
    37693771 $XIY  -xinput ............ Compile Xinput support. This also enabled tablet support
    37703772                         which requires IRIX with wacom.h and libXi or
    … …  
    39673969            echo "Type 'no' to decline this license offer."
    39683970            echo
    3969             if echo '\c' | grep '\c' >/dev/null; then
    3970                 echo -n "Do you accept the terms of $affix license? "
    3971             else
    3972                 echo "Do you accept the terms of $affix license? \c"
    3973             fi
     3971            echo $ECHO_N "Do you accept the terms of $affix license? $ECHO_C"
    39743972            read acceptance
    39753973        fi
    … …  
    40024000            echo "Type 'no' to decline this license offer."
    40034001            echo
    4004             if echo '\c' | grep '\c' >/dev/null; then
    4005                 echo -n "Do you accept the terms of the license? "
    4006             else
    4007                 echo "Do you accept the terms of the license? \c"
    4008             fi
     4002            echo $ECHO_N "Do you accept the terms of the license? $ECHO_C"
    40094003            read acceptance
    40104004        fi
    … …  
    40924086            echo "Type 'no' to decline this license offer."
    40934087            echo
    4094             if echo '\c' | grep '\c' >/dev/null; then
    4095                 echo -n "Do you accept the terms of the $TheLicense? "
    4096             else
    4097                 echo "Do you accept the terms of the $TheLicense? \c"
    4098             fi
     4088            echo $ECHO_N "Do you accept the terms of the $TheLicense? $ECHO_C"
    40994089            read acceptance
    41004090        fi
    … …  
    73917381
    73927382if [ "$OPT_VERBOSE" = "yes" ]; then
    7393     if echo '\c' | grep '\c' >/dev/null; then
    7394         echo -n "qmake vars .......... "
    7395     else
    7396         echo "qmake vars .......... \c"
    7397     fi
     7383    echo $ECHO_N "qmake vars .......... $ECHO_C"
    73987384    cat "$QMAKE_VARS_FILE" | tr '\n' ' '
    73997385    echo "qmake switches ...... $QMAKE_SWITCHES"
    … …  
    75587544fi
    75597545echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE"
     7546echo "Alsa support ........ $CFG_ALSA"
     7547echo
    75607548
    75617549[ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC"
    … …  
    75827570    echo
    75837571fi
    7584 echo "alsa support ........ $CFG_ALSA"
    7585 echo
    75867572
    75877573sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'`
    … …  
    77727758        fi
    77737759        QMAKE_SPEC_ARGS="-spec $SPEC"
    7774         if echo '\c' | grep '\c' >/dev/null; then
    7775             echo -n "  for $a"
    7776         else
    7777             echo "  for $a\c"
    7778         fi
     7760        echo $ECHO_N "  for $a$ECHO_C"
    77797761
    77807762        QMAKE="$outpath/bin/qmake"
    77817763        QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
    77827764        if [ "$file" = ".projects.3" ]; then
    7783             if echo '\c' | grep '\c' >/dev/null; then
    7784                 echo -n " (fast)"
    7785             else
    7786                 echo " (fast)\c"
    7787             fi
    7788             echo
     7765            echo " (fast)"
    77897766
    77907767            cat >"${OUTDIR}/Makefile" <<EOF
Note: See TracChangeset for help on using the changeset viewer.