@@ -522,19 +522,14 @@ AC_DEFUN([AQ_CHECK_QT4],[
522
522
QTDIR="$withval" , QTDIR="" )
523
523
524
524
QT_MIN_VER=4.1.0
525
-
526
- if test "x$QTDIR" == "x" ; then
525
+
526
+ if test "x$QTDIR" = "x" ; then
527
527
528
528
dnl ---------------------------------------------------------------------------
529
529
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
530
530
dnl ---------------------------------------------------------------------------
531
531
532
- PKG_CHECK_MODULES(QTCORE, QtCore >= $QT_MIN_VER)
533
- PKG_CHECK_MODULES(QTGUI, QtGui >= $QT_MIN_VER)
534
- PKG_CHECK_MODULES(QT3SUP, Qt3Support >= $QT_MIN_VER)
535
- PKG_CHECK_MODULES(QTNET, QtNetwork >= $QT_MIN_VER)
536
- PKG_CHECK_MODULES(QTXML, QtXml >= $QT_MIN_VER)
537
- PKG_CHECK_MODULES(QTSVG, QtSvg >= $QT_MIN_VER)
532
+ PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg >= $QT_MIN_VER)
538
533
539
534
dnl check for Qt binaries needed for compilation: moc,uic,rcc
540
535
dnl (we could also check for moc and uic versions)
@@ -554,12 +549,12 @@ AC_DEFUN([AQ_CHECK_QT4],[
554
549
555
550
dnl set and display variables
556
551
557
- QT_CXXFLAGS="-DQT3_SUPPORT $QTCORE_CFLAGS $QTGUI_CFLAGS $QT3SUP_CFLAGS $QTNET_CFLAGS $QTXML_CFLAGS $QTSVG_CFLAGS "
552
+ QT_CXXFLAGS="-DQT3_SUPPORT $QT_CFLAGS "
558
553
AC_MSG_CHECKING ( [ QT_CXXFLAGS] )
559
554
AC_MSG_RESULT ( [ $QT_CXXFLAGS] )
560
555
AC_SUBST ( [ $QT_CXXFLAGS] )
561
556
562
- QT_LDADD="$QTCORE_LIBS $QTGUI_LIBS $QT3SUP_LIBS $QTNET_LIBS $QTXML_LIBS $QTSVG_LIBS "
557
+ QT_LDADD="$QT_LIBS "
563
558
AC_MSG_CHECKING ( [ QT_LDADD] )
564
559
AC_MSG_RESULT ( [ $QT_LDADD] )
565
560
AC_SUBST ( [ $QT_LDADD] )
0 commit comments