Skip to content

Commit 68ec30c

Browse files
author
rblazek
committedAug 8, 2006
disabled --with-qt-pkg-config because PKG_CHECK_MODULES is not defined on many systems
git-svn-id: http://svn.osgeo.org/qgis/trunk@5673 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c98e349 commit 68ec30c

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed
 

‎acinclude.m4

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@ AC_SUBST(QASSISTANTCLIENT_LDADD)
484484
AC_SUBST(QTDIR)
485485
])
486486

487-
488487
dnl ------------------------------------------------------------------------
489488
dnl
490489
dnl improved Qt4 check
@@ -494,22 +493,25 @@ dnl
494493
dnl ------------------------------------------------------------------------
495494

496495
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")
503505
504506
if test "$QT_PKG_CONFIG" = "y" ; then
505-
507+
506508
dnl ---------------------------------------------------------------------------
507509
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
508510
dnl ---------------------------------------------------------------------------
509511
510512
QT_MIN_VER=4.1.0
511513
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)
513515
514516
dnl check for Qt binaries needed for compilation: moc,uic,rcc
515517
dnl (we could also check for moc and uic versions)
@@ -529,7 +531,7 @@ AC_DEFUN([AQ_CHECK_QT4],[
529531
530532
dnl workaround for case when QtTest doesn't report QtTest subdirectory
531533
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)
533535
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces
534536
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l`
535537
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then

0 commit comments

Comments
 (0)
Please sign in to comment.