Skip to content
Permalink
Browse files

Qt4 detection by using pkg-config is not default anymore, to enable i…

…t, use --with-qt-pkg-config

Added support for QtTest in pkg-config detection.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5257 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Apr 11, 2006
1 parent 691fbfa commit 6460892bd587a5732845907c08558bdefc46db27
Showing with 16 additions and 4 deletions.
  1. +16 −4 acinclude.m4
@@ -515,16 +515,19 @@ AC_DEFUN([AQ_CHECK_QT4],[
AC_ARG_WITH([qtdir], AC_HELP_STRING([--with-qtdir=DIR],[Qt4 installation directory]),
QTDIR="$withval", QTDIR="")
AC_ARG_WITH([qt-pkg-config], AC_HELP_STRING([--with-qt-pkg-config],
[Detect Qt4 directory using pkg-config instead of using --with-qtdir. Works only with Qt4 version for X11.]),
QT_PKG_CONFIG="y", QT_PKG_CONFIG="n")
QT_MIN_VER=4.1.0
if test "x$QTDIR" = "x" ; then
if test "$QT_PKG_CONFIG" = "y" ; then
dnl ---------------------------------------------------------------------------
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg >= $QT_MIN_VER)
QT_MIN_VER=4.1.0
PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER)
dnl check for Qt binaries needed for compilation: moc,uic,rcc
dnl (we could also check for moc and uic versions)
@@ -542,6 +545,15 @@ AC_DEFUN([AQ_CHECK_QT4],[
AC_MSG_ERROR([*** rcc must be in path])
fi
dnl workaround for case when QtTest doesn't report QtTest subdirectory
dnl in include path (this is not a very nice check)
PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER)
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l`
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then
QT_CFLAGS="$QT_CFLAGS $QT_TEST_CFLAGS/QtTest"
fi
dnl set and display variables
QT_CXXFLAGS="-DQT3_SUPPORT $QT_CFLAGS"

0 comments on commit 6460892

Please sign in to comment.
You can’t perform that action at this time.