Index: configure =================================================================== --- configure (revision 20607) +++ configure (working copy) @@ -1835,9 +1835,8 @@ /usr/local/include /usr/local/qt/include /usr/include \ /usr/include/qt /usr/include/qt3 qtinc=$found_hdr - qtincdir=$found_dir if test "x$qtinc" = "x"; then - echo No Qt3 was found, let\'s try to find Qt4 instead + echo No Qt3 was found, let\'s try to find Qt4 instead from $qtincdir check_header "Qt/qglobal.h" "$qtincdir" $QTDIR/include \ /usr/local/include/ /usr/local/qt/include \ /usr/include @@ -1853,6 +1852,8 @@ fi done fi + else + qtincdir=$found_dir fi if test "x$qt4" = "x"; then check_library "libqt-mt libqt qt-mt* qt-mt334 qt-mt335 qt-mt336 qt" "$enable_shared" \ @@ -1861,26 +1862,35 @@ qtlib=$found_lib qtlibdir=$found_dir else - check_library "libQtCore QtCore QtCore4" "$enable_shared" \ + qt4suffix="4" + if test "x$enable_winrtdebug" = "xyes"; then + qt4suffix="d4" + fi + check_library "libQtCore QtCore QtCore$qt4suffix" "$enable_shared" \ "$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib /usr/local/qt/lib \ /usr/lib /usr/qt/lib qtlib=$found_lib - qtlibdir=$found_dir - check_library "libQtGui QtGui QtGui4" "$enable_shared" \ + check_library "libQtGui QtGui QtGui$qt4suffix" "$enable_shared" \ + "$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib /usr/local/qt/lib \ "$found_raw_dir" "" qtlib="$qtlib $found_lib" - check_library "libQt3Support Qt3Support Qt3Support4" "$enable_shared" \ + check_library "libQt3Support Qt3Support Qt3Support$qt4suffix" "$enable_shared" \ + "$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib /usr/local/qt/lib \ "$found_raw_dir" "" qtlib="$qtlib $found_lib" - check_library "libQtOpenGL QtOpenGL QtOpenGL4" "$enable_shared" \ + check_library "libQtOpenGL QtOpenGL QtOpenGL$qt4suffix" "$enable_shared" \ + "$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib /usr/local/qt/lib \ "$found_raw_dir" "" qtlib="$qtlib $found_lib" - check_library "libQtSvg QtSvg QtSvg4" "$enable_shared" \ + check_library "libQtSvg QtSvg QtSvg$qt4suffix" "$enable_shared" \ + "$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib /usr/local/qt/lib \ "$found_raw_dir" "" qtlib="$qtlib $found_lib" - check_library "libQtXml QtXml QtXml4" "$enable_shared" \ + check_library "libQtXml QtXml QtXml$qt4suffix" "$enable_shared" \ + "$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib /usr/local/qt/lib \ "$found_raw_dir" "" qtlib="$qtlib $found_lib" + qtlibdir=$found_dir fi message "Checking for moc or moc.exe" @@ -4863,3 +4873,4 @@ result "" exit 0 +