Index: /trunk/configure
===================================================================
--- /trunk/configure	(revision 57898)
+++ /trunk/configure	(revision 57899)
@@ -1541,4 +1541,5 @@
         I_INCQT4=`prefix_I "$INCQT4"`
         LIBQT4="-L$q/lib -lQtCoreVBox"
+        TOOLQT4="$q"
         if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal &&
             test_execute_path "`strip_L "$LIBQT4"`" nofatal; then
@@ -1603,5 +1604,5 @@
           fi
           test_header "Qt4 devtools"
-          for q in $QT4DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.*; do
+          for q in $TOOLQT4; do
             # first try it with a suffix, some platforms use that
             if which_wrapper "$q/bin/moc-qt4" > /dev/null; then