Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 97742 Details for
Bug 56262
qgis ebuild
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to reenable Qt detection with pkg-config
qgis-pkg-config.diff (text/plain), 2.39 KB, created by
Martin Dobias
on 2006-09-22 05:48:18 UTC
(
hide
)
Description:
Patch to reenable Qt detection with pkg-config
Filename:
MIME Type:
Creator:
Martin Dobias
Created:
2006-09-22 05:48:18 UTC
Size:
2.39 KB
patch
obsolete
>Index: acinclude.m4 >=================================================================== >--- acinclude.m4 (revision 5673) >+++ acinclude.m4 (revision 5672) >@@ -484,6 +484,7 @@ > AC_SUBST(QTDIR) > ]) > >+ > dnl ------------------------------------------------------------------------ > dnl > dnl improved Qt4 check >@@ -493,25 +494,22 @@ > dnl ------------------------------------------------------------------------ > > AC_DEFUN([AQ_CHECK_QT4],[ >- >-# Commented, it is defined above >-# AC_ARG_WITH([qtdir], AC_HELP_STRING([--with-qtdir=DIR],[Qt4 installation directory]), >-# QTDIR="$withval", QTDIR="") >+ >+ 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") > >-# WARNING: PKG_CHECK_MODULES fails on many systems (not defined) => commented >-# 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") >- > if test "$QT_PKG_CONFIG" = "y" ; then >- >+ > dnl --------------------------------------------------------------------------- > dnl we will use PKGCONFIG, check that all needed Qt4 components are there > dnl --------------------------------------------------------------------------- > > QT_MIN_VER=4.1.0 > >- #PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) >+ 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) >@@ -531,7 +529,7 @@ > > 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) >+ 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 56262
:
44815
|
45160
|
47690
|
48600
|
51223
|
55362
|
55367
|
57293
|
57364
|
64446
|
64495
|
64901
|
64903
|
67672
|
67720
|
67820
|
68003
|
68006
|
69038
|
70498
|
70583
|
72171
|
80743
|
81191
|
82342
|
88106
|
90976
| 97742 |
97761
|
98062
|
98118
|
98238
|
99966
|
101036
|
102166
|
104978
|
104979
|
105391
|
105534
|
106356
|
135493
|
141106
|
141123
|
141124
|
141127
|
145949
|
152219
|
152231
|
152233
|
160875
|
161026
|
161028
|
161313
|
161442
|
161443
|
162348
|
166940
|
166942
|
169514
|
173271
|
174150
|
176003
|
182560
|
195744
|
197535
|
204788