Index: acinclude.m4 =================================================================== --- acinclude.m4 (revision 6101) +++ acinclude.m4 (working copy) @@ -542,7 +542,7 @@ QT_MIN_VER=4.1.0 -dnl PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) + PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) dnl check for Qt binaries needed for compilation: moc,uic,rcc dnl (we could also check for moc and uic versions) @@ -562,7 +562,7 @@ dnl workaround for case when QtTest doesn't report QtTest subdirectory dnl in include path (this is not a very nice check) -dnl PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) + PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l` if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then @@ -581,7 +581,8 @@ AC_MSG_RESULT([$QT_LDADD]) AC_SUBST([$QT_LDADD]) - QTDIR="no_qtdir" + # QTDIR is used for compiling translations to run qmake + QTDIR="/usr" AC_SUBST([$QTDIR]) QT_MAJOR=4