Skip to content

Commit f641c58

Browse files
author
wonder
committed
small fix that resolves redundant compiler/linker flags from pkg-config
git-svn-id: http://svn.osgeo.org/qgis/trunk@5037 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 5dd5770 commit f641c58

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

acinclude.m4

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -522,19 +522,14 @@ AC_DEFUN([AQ_CHECK_QT4],[
522522
QTDIR="$withval", QTDIR="")
523523
524524
QT_MIN_VER=4.1.0
525-
526-
if test "x$QTDIR" == "x" ; then
525+
526+
if test "x$QTDIR" = "x" ; then
527527
528528
dnl ---------------------------------------------------------------------------
529529
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
530530
dnl ---------------------------------------------------------------------------
531531
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)
538533
539534
dnl check for Qt binaries needed for compilation: moc,uic,rcc
540535
dnl (we could also check for moc and uic versions)
@@ -554,12 +549,12 @@ AC_DEFUN([AQ_CHECK_QT4],[
554549
555550
dnl set and display variables
556551
557-
QT_CXXFLAGS="-DQT3_SUPPORT $QTCORE_CFLAGS $QTGUI_CFLAGS $QT3SUP_CFLAGS $QTNET_CFLAGS $QTXML_CFLAGS $QTSVG_CFLAGS"
552+
QT_CXXFLAGS="-DQT3_SUPPORT $QT_CFLAGS"
558553
AC_MSG_CHECKING([QT_CXXFLAGS])
559554
AC_MSG_RESULT([$QT_CXXFLAGS])
560555
AC_SUBST([$QT_CXXFLAGS])
561556
562-
QT_LDADD="$QTCORE_LIBS $QTGUI_LIBS $QT3SUP_LIBS $QTNET_LIBS $QTXML_LIBS $QTSVG_LIBS"
557+
QT_LDADD="$QT_LIBS"
563558
AC_MSG_CHECKING([QT_LDADD])
564559
AC_MSG_RESULT([$QT_LDADD])
565560
AC_SUBST([$QT_LDADD])

0 commit comments

Comments
 (0)