|
Lines 60-66
Link Here
|
| 60 |
if [ "$QC_DEBUG" = "Y" ]; then |
60 |
if [ "$QC_DEBUG" = "Y" ]; then |
| 61 |
echo \$QTDIR not set... trying to find Qt manually |
61 |
echo \$QTDIR not set... trying to find Qt manually |
| 62 |
fi |
62 |
fi |
| 63 |
for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do |
63 |
for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do |
| 64 |
if [ -d "$p/mkspecs" ]; then |
64 |
if [ -d "$p/mkspecs" ]; then |
| 65 |
QTDIR=$p |
65 |
QTDIR=$p |
| 66 |
break; |
66 |
break; |
|
Lines 79-93
Link Here
|
| 79 |
fi |
79 |
fi |
| 80 |
fi |
80 |
fi |
| 81 |
|
81 |
|
| 82 |
if [ ! -x "$QTDIR/bin/tqmake" ]; then |
82 |
if [ ! -x "$QTDIR/bin/qmake" ]; then |
| 83 |
if [ "$QC_DEBUG" = "Y" ]; then |
83 |
if [ "$QC_DEBUG" = "Y" ]; then |
| 84 |
echo Warning: tqmake not in \$QTDIR/bin/tqmake |
84 |
echo Warning: qmake not in \$QTDIR/bin/qmake |
| 85 |
echo trying to find it in \$PATH |
85 |
echo trying to find it in \$PATH |
| 86 |
fi |
86 |
fi |
| 87 |
qm=`type -p tqmake` |
87 |
qm=`type -p qmake` |
| 88 |
if [ -x "$qm" ]; then |
88 |
if [ -x "$qm" ]; then |
| 89 |
if [ "$QC_DEBUG" = "Y" ]; then |
89 |
if [ "$QC_DEBUG" = "Y" ]; then |
| 90 |
echo tqmake found in $qm |
90 |
echo qmake found in $qm |
| 91 |
fi |
91 |
fi |
| 92 |
else |
92 |
else |
| 93 |
echo fail |
93 |
echo fail |
|
Lines 96-107
Link Here
|
| 96 |
echo or I missdetected \$QTDIR=$QTDIR |
96 |
echo or I missdetected \$QTDIR=$QTDIR |
| 97 |
echo |
97 |
echo |
| 98 |
echo Please set \$QTDIR manually and make sure that |
98 |
echo Please set \$QTDIR manually and make sure that |
| 99 |
echo \$QTDIR/bin/tqmake exists. |
99 |
echo \$QTDIR/bin/qmake exists. |
| 100 |
echo |
100 |
echo |
| 101 |
exit 1; |
101 |
exit 1; |
| 102 |
fi |
102 |
fi |
| 103 |
else |
103 |
else |
| 104 |
qm=$QTDIR/bin/tqmake |
104 |
qm=$QTDIR/bin/qmake |
| 105 |
fi |
105 |
fi |
| 106 |
|
106 |
|
| 107 |
gen_files() { |
107 |
gen_files() { |
|
Lines 184-190
Link Here
|
| 184 |
conf->addLib("-lssl -lcrypto"); |
184 |
conf->addLib("-lssl -lcrypto"); |
| 185 |
|
185 |
|
| 186 |
// Make sure tqtinterface can be found |
186 |
// Make sure tqtinterface can be found |
| 187 |
conf->addIncludePath("/usr/include/tqt"); |
187 |
conf->addIncludePath("/opt/trinity/include/tqt"); |
|
|
188 |
// Make sure tqt3 can be found |
| 189 |
conf->addIncludePath("${QTINC:-${QTDIR}/include}"); |
| 188 |
|
190 |
|
| 189 |
return true; |
191 |
return true; |
| 190 |
} |
192 |
} |
|
Lines 476-482
Link Here
|
| 476 |
|
478 |
|
| 477 |
TQString str; |
479 |
TQString str; |
| 478 |
str += "# qconf\n"; |
480 |
str += "# qconf\n"; |
| 479 |
str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n'; |
481 |
str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n'; |
| 480 |
if(!conf->DEFINES.isEmpty()) |
482 |
if(!conf->DEFINES.isEmpty()) |
| 481 |
str += "DEFINES += " + conf->DEFINES + '\n'; |
483 |
str += "DEFINES += " + conf->DEFINES + '\n'; |
| 482 |
if(!conf->INCLUDEPATH.isEmpty()) |
484 |
if(!conf->INCLUDEPATH.isEmpty()) |
|
Lines 511-517
Link Here
|
| 511 |
TEMPLATE = app |
513 |
TEMPLATE = app |
| 512 |
CONFIG += qt x11 thread console |
514 |
CONFIG += qt x11 thread console |
| 513 |
TARGET = conf |
515 |
TARGET = conf |
| 514 |
INCLUDEPATH += '/usr/include/tqt' |
516 |
INCLUDEPATH += '/opt/trinity/include/tqt' '${QTINC:-${QTDIR}/include}' |
| 515 |
|
517 |
|
| 516 |
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' |
518 |
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' |
| 517 |
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' |
519 |
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' |
|
Lines 537-552
Link Here
|
| 537 |
) |
539 |
) |
| 538 |
|
540 |
|
| 539 |
if [ "$?" != "0" ]; then |
541 |
if [ "$?" != "0" ]; then |
| 540 |
rm -rf .qconftemp |
542 |
# rm -rf .qconftemp |
| 541 |
echo fail |
543 |
echo fail |
| 542 |
echo |
544 |
echo |
| 543 |
echo "There was an error compiling 'conf'. Be sure you have a proper" |
545 |
echo "There was an error compiling 'conf'. Be sure you have a proper" |
| 544 |
echo "TQt 3.x Multithreaded (MT) build environment set up." |
546 |
echo "TQt 3.x Multithreaded (MT) build environment set up." |
| 545 |
if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then |
547 |
if [ ! -f "${QTLIB:-${QTDIR}/lib}/libqt-mt.so.3" ]; then |
| 546 |
if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then |
548 |
if [ ! -f "${QTLIB:-${QTDIR}/lib64}/libqt-mt.so.3" ]; then |
| 547 |
echo |
549 |
echo |
| 548 |
echo "One possible reason is that you don't have" |
550 |
echo "One possible reason is that you don't have" |
| 549 |
echo "libtqt-mt.so.3 installed in $QTDIR/lib/" |
551 |
echo "libqt-mt.so.3 installed in $QTDIR/lib/" |
| 550 |
echo "or $QTDIR/lib64/." |
552 |
echo "or $QTDIR/lib64/." |
| 551 |
fi |
553 |
fi |
| 552 |
fi |
554 |
fi |
|
Lines 575-581
Link Here
|
| 575 |
if [ -x "./qcextra" ]; then |
577 |
if [ -x "./qcextra" ]; then |
| 576 |
./qcextra |
578 |
./qcextra |
| 577 |
fi |
579 |
fi |
| 578 |
# run tqmake |
580 |
# run qmake |
| 579 |
if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then |
581 |
if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then |
| 580 |
$qm QMAKE_STRIP=true qca-tls.pro |
582 |
$qm QMAKE_STRIP=true qca-tls.pro |
| 581 |
else |
583 |
else |