|
Lines 542-548
Link Here
|
| 542 |
|
542 |
|
| 543 |
QT_MIN_VER=4.1.0 |
543 |
QT_MIN_VER=4.1.0 |
| 544 |
|
544 |
|
| 545 |
dnl PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) |
545 |
PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) |
| 546 |
|
546 |
|
| 547 |
dnl check for Qt binaries needed for compilation: moc,uic,rcc |
547 |
dnl check for Qt binaries needed for compilation: moc,uic,rcc |
| 548 |
dnl (we could also check for moc and uic versions) |
548 |
dnl (we could also check for moc and uic versions) |
|
Lines 562-568
Link Here
|
| 562 |
|
562 |
|
| 563 |
dnl workaround for case when QtTest doesn't report QtTest subdirectory |
563 |
dnl workaround for case when QtTest doesn't report QtTest subdirectory |
| 564 |
dnl in include path (this is not a very nice check) |
564 |
dnl in include path (this is not a very nice check) |
| 565 |
dnl PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) |
565 |
PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) |
| 566 |
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces |
566 |
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces |
| 567 |
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l` |
567 |
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l` |
| 568 |
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then |
568 |
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then |
|
Lines 581-587
Link Here
|
| 581 |
AC_MSG_RESULT([$QT_LDADD]) |
581 |
AC_MSG_RESULT([$QT_LDADD]) |
| 582 |
AC_SUBST([$QT_LDADD]) |
582 |
AC_SUBST([$QT_LDADD]) |
| 583 |
|
583 |
|
| 584 |
QTDIR="no_qtdir" |
584 |
# QTDIR is used for compiling translations to run qmake |
|
|
585 |
QTDIR="/usr" |
| 585 |
AC_SUBST([$QTDIR]) |
586 |
AC_SUBST([$QTDIR]) |
| 586 |
|
587 |
|
| 587 |
QT_MAJOR=4 |
588 |
QT_MAJOR=4 |
