@@ -484,7 +484,6 @@ AC_SUBST(QASSISTANTCLIENT_LDADD)
484
484
AC_SUBST ( QTDIR )
485
485
] )
486
486
487
-
488
487
dnl ------------------------------------------------------------------------
489
488
dnl
490
489
dnl improved Qt4 check
@@ -494,22 +493,25 @@ dnl
494
493
dnl ------------------------------------------------------------------------
495
494
496
495
AC_DEFUN ( [ AQ_CHECK_QT4] ,[
497
-
498
- AC_ARG_WITH ( [ qtdir] , AC_HELP_STRING ( [ --with-qtdir=DIR] ,[ Qt4 installation directory] ) ,
499
- QTDIR="$withval" , QTDIR="" )
500
- AC_ARG_WITH ( [ qt-pkg-config] , AC_HELP_STRING ( [ --with-qt-pkg-config] ,
501
- [ Detect Qt4 directory using pkg-config instead of using --with-qtdir. Works only with Qt4 version for X11.] ) ,
502
- QT_PKG_CONFIG="y" , QT_PKG_CONFIG="n" )
496
+
497
+ # Commented, it is defined above
498
+ # AC_ARG_WITH ( [ qtdir] , AC_HELP_STRING ( [ --with-qtdir=DIR] ,[ Qt4 installation directory] ) ,
499
+ # QTDIR="$withval", QTDIR="")
500
+
501
+ # WARNING: PKG_CHECK_MODULES fails on many systems (not defined) => commented
502
+ # AC_ARG_WITH([qt-pkg-config], AC_HELP_STRING([--with-qt-pkg-config],
503
+ # [Detect Qt4 directory using pkg-config instead of using --with-qtdir. Works only with Qt4 version for X11.]),
504
+ # QT_PKG_CONFIG="y", QT_PKG_CONFIG="n")
503
505
504
506
if test "$QT_PKG_CONFIG" = "y" ; then
505
-
507
+
506
508
dnl ---------------------------------------------------------------------------
507
509
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
508
510
dnl ---------------------------------------------------------------------------
509
511
510
512
QT_MIN_VER=4.1.0
511
513
512
- PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER)
514
+ # PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER)
513
515
514
516
dnl check for Qt binaries needed for compilation: moc,uic,rcc
515
517
dnl (we could also check for moc and uic versions)
@@ -529,7 +531,7 @@ AC_DEFUN([AQ_CHECK_QT4],[
529
531
530
532
dnl workaround for case when QtTest doesn't report QtTest subdirectory
531
533
dnl in include path (this is not a very nice check)
532
- PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER)
534
+ # PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER)
533
535
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/ [ \t] * $//'` # remove trailing spaces
534
536
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc - l`
535
537
if test "$QTTEST_HAS_SUBDIR" - eq "0" ; then
0 commit comments