|
Lines 519-525
Link Here
|
| 519 |
|
519 |
|
| 520 |
QT_MIN_VER=4.1.0 |
520 |
QT_MIN_VER=4.1.0 |
| 521 |
|
521 |
|
| 522 |
dnl PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) |
522 |
PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) |
| 523 |
|
523 |
|
| 524 |
dnl check for Qt binaries needed for compilation: moc,uic,rcc |
524 |
dnl check for Qt binaries needed for compilation: moc,uic,rcc |
| 525 |
dnl (we could also check for moc and uic versions) |
525 |
dnl (we could also check for moc and uic versions) |
|
Lines 539-545
Link Here
|
| 539 |
|
539 |
|
| 540 |
dnl workaround for case when QtTest doesn't report QtTest subdirectory |
540 |
dnl workaround for case when QtTest doesn't report QtTest subdirectory |
| 541 |
dnl in include path (this is not a very nice check) |
541 |
dnl in include path (this is not a very nice check) |
| 542 |
dnl PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) |
542 |
PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) |
| 543 |
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces |
543 |
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces |
| 544 |
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l` |
544 |
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l` |
| 545 |
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then |
545 |
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then |
|
Lines 559-564
Link Here
|
| 559 |
AC_SUBST([$QT_LDADD]) |
559 |
AC_SUBST([$QT_LDADD]) |
| 560 |
|
560 |
|
| 561 |
QTDIR="no_qtdir" |
561 |
QTDIR="no_qtdir" |
|
|
562 |
dnl QTDIR is used for compiling translations to run qmake |
| 563 |
QTDIR="/usr" |
| 562 |
AC_SUBST([$QTDIR]) |
564 |
AC_SUBST([$QTDIR]) |
| 563 |
|
565 |
|
| 564 |
QT_MAJOR=4 |
566 |
QT_MAJOR=4 |
