equal
deleted
inserted
replaced
171 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown |
171 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown |
172 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
172 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
173 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
173 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
174 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
174 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
175 |
175 |
|
176 # detect the "echo without newline" style. usage: echo $ECHO_N "<string>$ECHO_C" |
|
177 if echo '\c' | grep '\c' >/dev/null; then |
|
178 ECHO_N=-n |
|
179 else |
|
180 ECHO_C='\c' |
|
181 fi |
176 |
182 |
177 #------------------------------------------------------------------------------- |
183 #------------------------------------------------------------------------------- |
178 # window system detection |
184 # window system detection |
179 #------------------------------------------------------------------------------- |
185 #------------------------------------------------------------------------------- |
180 |
186 |
397 exit 1 |
403 exit 1 |
398 fi |
404 fi |
399 else |
405 else |
400 if [ -z "$LicenseKeyExt" ]; then |
406 if [ -z "$LicenseKeyExt" ]; then |
401 echo |
407 echo |
402 if echo '\c' | grep '\c' >/dev/null; then |
408 echo $ECHO_N "Please enter your license key: $ECHO_C" |
403 echo -n "Please enter your license key: " |
|
404 else |
|
405 echo "Please enter your license key: \c" |
|
406 fi |
|
407 read LicenseKeyExt |
409 read LicenseKeyExt |
408 Licensee="Unknown user" |
410 Licensee="Unknown user" |
409 fi |
411 fi |
410 fi |
412 fi |
411 |
413 |
4004 fi |
4006 fi |
4005 echo "Type 'L' to view the Lesser GNU General Public License version 2.1." |
4007 echo "Type 'L' to view the Lesser GNU General Public License version 2.1." |
4006 echo "Type 'yes' to accept this license offer." |
4008 echo "Type 'yes' to accept this license offer." |
4007 echo "Type 'no' to decline this license offer." |
4009 echo "Type 'no' to decline this license offer." |
4008 echo |
4010 echo |
4009 if echo '\c' | grep '\c' >/dev/null; then |
4011 echo $ECHO_N "Do you accept the terms of $affix license? $ECHO_C" |
4010 echo -n "Do you accept the terms of $affix license? " |
|
4011 else |
|
4012 echo "Do you accept the terms of $affix license? \c" |
|
4013 fi |
|
4014 read acceptance |
4012 read acceptance |
4015 fi |
4013 fi |
4016 echo |
4014 echo |
4017 if [ "$acceptance" = "yes" ] || [ "$acceptance" = "y" ]; then |
4015 if [ "$acceptance" = "yes" ] || [ "$acceptance" = "y" ]; then |
4018 break |
4016 break |
4039 echo |
4037 echo |
4040 echo "Type '?' to read the Preview License." |
4038 echo "Type '?' to read the Preview License." |
4041 echo "Type 'yes' to accept this license offer." |
4039 echo "Type 'yes' to accept this license offer." |
4042 echo "Type 'no' to decline this license offer." |
4040 echo "Type 'no' to decline this license offer." |
4043 echo |
4041 echo |
4044 if echo '\c' | grep '\c' >/dev/null; then |
4042 echo $ECHO_N "Do you accept the terms of the license? $ECHO_C" |
4045 echo -n "Do you accept the terms of the license? " |
|
4046 else |
|
4047 echo "Do you accept the terms of the license? \c" |
|
4048 fi |
|
4049 read acceptance |
4043 read acceptance |
4050 fi |
4044 fi |
4051 echo |
4045 echo |
4052 if [ "$acceptance" = "yes" ]; then |
4046 if [ "$acceptance" = "yes" ]; then |
4053 break |
4047 break |
4129 echo |
4123 echo |
4130 echo "Type '?' to view the $TheLicense." |
4124 echo "Type '?' to view the $TheLicense." |
4131 echo "Type 'yes' to accept this license offer." |
4125 echo "Type 'yes' to accept this license offer." |
4132 echo "Type 'no' to decline this license offer." |
4126 echo "Type 'no' to decline this license offer." |
4133 echo |
4127 echo |
4134 if echo '\c' | grep '\c' >/dev/null; then |
4128 echo $ECHO_N "Do you accept the terms of the $TheLicense? $ECHO_C" |
4135 echo -n "Do you accept the terms of the $TheLicense? " |
|
4136 else |
|
4137 echo "Do you accept the terms of the $TheLicense? \c" |
|
4138 fi |
|
4139 read acceptance |
4129 read acceptance |
4140 fi |
4130 fi |
4141 echo |
4131 echo |
4142 if [ "$acceptance" = "yes" ]; then |
4132 if [ "$acceptance" = "yes" ]; then |
4143 break |
4133 break |
7437 else |
7427 else |
7438 echo |
7428 echo |
7439 fi |
7429 fi |
7440 |
7430 |
7441 if [ "$OPT_VERBOSE" = "yes" ]; then |
7431 if [ "$OPT_VERBOSE" = "yes" ]; then |
7442 if echo '\c' | grep '\c' >/dev/null; then |
7432 echo $ECHO_N "qmake vars .......... $ECHO_C" |
7443 echo -n "qmake vars .......... " |
|
7444 else |
|
7445 echo "qmake vars .......... \c" |
|
7446 fi |
|
7447 cat "$QMAKE_VARS_FILE" | tr '\n' ' ' |
7433 cat "$QMAKE_VARS_FILE" | tr '\n' ' ' |
7448 echo "qmake switches ...... $QMAKE_SWITCHES" |
7434 echo "qmake switches ...... $QMAKE_SWITCHES" |
7449 fi |
7435 fi |
7450 |
7436 |
7451 [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL" |
7437 [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL" |
7818 # file changes... |
7804 # file changes... |
7819 [ "$OPT_VERBOSE" = "yes" ] && echo " skipping $a" |
7805 [ "$OPT_VERBOSE" = "yes" ] && echo " skipping $a" |
7820 continue; |
7806 continue; |
7821 fi |
7807 fi |
7822 QMAKE_SPEC_ARGS="-spec $SPEC" |
7808 QMAKE_SPEC_ARGS="-spec $SPEC" |
7823 if echo '\c' | grep '\c' >/dev/null; then |
7809 echo $ECHO_N " for $a$ECHO_C" |
7824 echo -n " for $a" |
|
7825 else |
|
7826 echo " for $a\c" |
|
7827 fi |
|
7828 |
7810 |
7829 QMAKE="$outpath/bin/qmake" |
7811 QMAKE="$outpath/bin/qmake" |
7830 QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" |
7812 QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" |
7831 if [ "$file" = ".projects.3" ]; then |
7813 if [ "$file" = ".projects.3" ]; then |
7832 if echo '\c' | grep '\c' >/dev/null; then |
7814 echo " (fast)" |
7833 echo -n " (fast)" |
|
7834 else |
|
7835 echo " (fast)\c" |
|
7836 fi |
|
7837 echo |
|
7838 |
7815 |
7839 cat >"${OUTDIR}/Makefile" <<EOF |
7816 cat >"${OUTDIR}/Makefile" <<EOF |
7840 # ${OUTDIR}/Makefile: generated by configure |
7817 # ${OUTDIR}/Makefile: generated by configure |
7841 # |
7818 # |
7842 # WARNING: This makefile will be replaced with a real makefile. |
7819 # WARNING: This makefile will be replaced with a real makefile. |