diff options
| -rwxr-xr-x | configure | 42 |
1 files changed, 21 insertions, 21 deletions
@@ -20,7 +20,7 @@ EOT while [ $# -gt 0 ]; do case "$1" in --qtdir=*) - QTDIR=`expr "${1}" : "--qtdir=\(.*\)"` + TQTDIR=`expr "${1}" : "--qtdir=\(.*\)"` shift ;; @@ -48,7 +48,7 @@ echo "Configuring tqca-tls ..." if [ "$QC_DEBUG" = "Y" ]; then echo -echo QTDIR=$QTDIR +echo TQTDIR=$TQTDIR echo QC_WITH_OPENSSL_INC=$QC_WITH_OPENSSL_INC echo QC_WITH_OPENSSL_LIB=$QC_WITH_OPENSSL_LIB echo @@ -56,20 +56,20 @@ fi printf "Verifying TQt 3.x Multithreaded (MT) build environment ... " -if [ -z "$QTDIR" ]; then +if [ -z "$TQTDIR" ]; then if [ "$QC_DEBUG" = "Y" ]; then - echo \$QTDIR not set... trying to find Qt manually + echo \$TQTDIR not set... trying to find Qt manually fi 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 if [ -d "$p/mkspecs" ]; then - QTDIR=$p + TQTDIR=$p break; fi; done - if [ -z "$QTDIR" ]; then + if [ -z "$TQTDIR" ]; then echo fail echo - echo Unable to find Qt 'mkspecs'. Please set QTDIR + echo Unable to find Qt 'mkspecs'. Please set TQTDIR echo manually. Perhaps you need to install Qt 3 echo development utilities. You may download them either echo from the vendor of your operating system or from @@ -79,9 +79,9 @@ if [ -z "$QTDIR" ]; then fi fi -if [ ! -x "$QTDIR/bin/tqmake" ]; then +if [ ! -x "$TQTDIR/bin/tqmake" ]; then if [ "$QC_DEBUG" = "Y" ]; then - echo Warning: tqmake not in \$QTDIR/bin/tqmake + echo Warning: tqmake not in \$TQTDIR/bin/tqmake echo trying to find it in \$PATH fi qm=`type -p tqmake` @@ -93,15 +93,15 @@ if [ ! -x "$QTDIR/bin/tqmake" ]; then echo fail echo echo Sorry, you seem to have a very unusual setup, - echo or I missdetected \$QTDIR=$QTDIR + echo or I missdetected \$TQTDIR=$TQTDIR echo - echo Please set \$QTDIR manually and make sure that - echo \$QTDIR/bin/tqmake exists. + echo Please set \$TQTDIR manually and make sure that + echo \$TQTDIR/bin/tqmake exists. echo exit 1; fi else - qm=$QTDIR/bin/tqmake + qm=$TQTDIR/bin/tqmake fi gen_files() { @@ -523,7 +523,7 @@ SOURCES += conf.cpp EOT } -export QTDIR +export TQTDIR export QC_WITH_OPENSSL_INC export QC_WITH_OPENSSL_LIB rm -rf .qconftemp @@ -532,8 +532,8 @@ rm -rf .qconftemp gen_files .qconftemp cd .qconftemp $qm conf.pro >/dev/null - QTDIR=$QTDIR make clean >/dev/null 2>&1 - QTDIR=$QTDIR make >../conf.log 2>&1 + TQTDIR=$TQTDIR make clean >/dev/null 2>&1 + TQTDIR=$TQTDIR make >../conf.log 2>&1 ) if [ "$?" != "0" ]; then @@ -542,12 +542,12 @@ if [ "$?" != "0" ]; then echo echo "There was an error compiling 'conf'. Be sure you have a proper" echo "TQt 3.x Multithreaded (MT) build environment set up." - if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then - if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then + if [ ! -f "$TQTDIR/lib/libtqt-mt.so.3" ]; then + if [ ! -f "$TQTDIR/lib64/libtqt-mt.so.3" ]; then echo echo "One possible reason is that you don't have" - echo "libtqt-mt.so.3 installed in $QTDIR/lib/" - echo "or $QTDIR/lib64/." + echo "libtqt-mt.so.3 installed in $TQTDIR/lib/" + echo "or $TQTDIR/lib64/." fi fi echo @@ -586,7 +586,7 @@ if [ "$?" != "0" ]; then exit 1; fi cat >Makefile.tmp <<EOT -export QTDIR = $QTDIR +export TQTDIR = $TQTDIR EOT cat Makefile >> Makefile.tmp rm -f Makefile |