summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2004-08-24 20:00:14 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2004-08-24 20:00:14 (GMT)
commit3aaaf142be657201a2664c10b96447acb1610187 (patch)
treeacf5ce8ed64ee56e5f7eec664f2f00260d068e9c /configure
parentedeb82c1e0cebe5437fb637c9d239a8cecfca0cb (diff)
downloadDoxygen-3aaaf142be657201a2664c10b96447acb1610187.zip
Doxygen-3aaaf142be657201a2664c10b96447acb1610187.tar.gz
Doxygen-3aaaf142be657201a2664c10b96447acb1610187.tar.bz2
Release-1.3.8-20040824
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure48
1 files changed, 28 insertions, 20 deletions
diff --git a/configure b/configure
index b1f02ee..3985b91 100755
--- a/configure
+++ b/configure
@@ -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!"