diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 48 |
1 files changed, 28 insertions, 20 deletions
@@ -234,27 +234,35 @@ if test "$f_wizard" = YES; then if test -z "$QTDIR"; then echo " QTDIR environment variable not set!" echo -n " Checking for Qt..." - if test -d "/usr/lib/qt3/lib"; then - if test -d "/usr/lib/qt3/include"; then - if test -x "/usr/lib/qt3/bin/moc"; then - QTDIR="/usr/lib/qt3" - fi - fi - fi - if test -d "/usr/lib/qt2/lib"; then - if test -d "/usr/lib/qt2/include"; then - if test -x "/usr/lib/qt2/bin/moc"; then - QTDIR="/usr/lib/qt2" - fi - fi - fi - if test -d "/usr/lib/qt/lib"; then - if test -d "/usr/lib/qt/include"; then - if test -x "/usr/lib/qt/bin/moc"; then - QTDIR="/usr/lib/qt" - fi + for d in /usr/lib/{qt-3.1,qt3,qt2,qt,qt*}; do + if test -d "$d/lib" -a -d "$d/include" -a -x "$d/bin/moc"; then + QTDIR=$d fi - fi + done +# if test -d "/usr/lib/qt3/lib"; then +# if test -d "/usr/lib/qt3/include"; then +# if test -x "/usr/lib/qt3/bin/moc"; then +# QTDIR="/usr/lib/qt3" +# fi +# fi +# fi +# if test -d "/usr/lib/qt2/lib"; then +# if test -d "/usr/lib/qt2/include"; then +# if test -x "/usr/lib/qt2/bin/moc"; then +# QTDIR="/usr/lib/qt2" +# fi +# fi +# fi +# if test -d "/usr/lib/qt/lib"; then +# if test -d "/usr/lib/qt/include"; then +# if test -x "/usr/lib/qt/bin/moc"; then +# QTDIR="/usr/lib/qt" +# fi +# fi +# fi + else + echo " Detected Qt via the QTDIR environment variable..." + echo -n " " fi if test -z "$QTDIR"; then echo "QTDIR not set and Qt not found at standard locations!" |