/[gentoo-x86]/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
Gentoo

Contents of /dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Feb 19 12:31:23 2011 UTC (3 years, 4 months ago) by blueness
Branch: MAIN
Version bump, added patch to fix qtcore automagic

(Portage version: 2.1.9.25/cvs/Linux x86_64)

1 --- configure.in.orig 2011-02-17 14:29:14.000000000 -0500
2 +++ configure.in 2011-02-17 15:05:46.000000000 -0500
3 @@ -1692,7 +1692,8 @@
4 # NEEDED BY THE REGRESSION TEST PROGRAMS.
5
6
7 -# The test below verifies whether the QtCore package been installed.
8 +# The test below first checks if the user has manaually disabled
9 +# QtCore. It then verifies whether the QtCore package been installed.
10 # This test works as follows:
11 # - If pkg-config was not installed at the time autogen.sh was run,
12 # the definition of the PKG_CHECK_EXISTS() macro will not be found by
13 @@ -1709,37 +1710,49 @@
14 # the pkg-config executable is not present on the system on which the
15 # configure script is run.
16
17 -ifdef(
18 - [PKG_CHECK_EXISTS],
19 - [PKG_CHECK_EXISTS(
20 - [QtCore],
21 +AC_ARG_ENABLE(qtcore,
22 + AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
23 [
24 - PKG_CHECK_MODULES([QTCORE], [QtCore])
25 - # Paranoia: don't trust the result reported by pkg-config, but when
26 - # pkg-config reports that QtCore has been found, verify whether linking
27 - # programs with QtCore succeeds.
28 - AC_LANG(C++)
29 - safe_CXXFLAGS="${CXXFLAGS}"
30 - CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
31 - AC_TRY_LINK(
32 - [#include <QMutex>],
33 - [QMutex Mutex;],
34 - [ac_have_qtcore=yes],
35 - [
36 - AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
37 - ac_have_qtcore=no
38 - ]
39 - )
40 - CXXFLAGS="${safe_CXXFLAGS}"
41 + if test x$enableval = xno ; then
42 + AC_MSG_CHECKING([for QTCORE ])
43 + AC_MSG_RESULT([QTCORE is manually distabled.])
44 + [ac_have_qtcore=no]
45 + fi
46 ],
47 [
48 - ac_have_qtcore=no
49 + ifdef(
50 + [PKG_CHECK_EXISTS],
51 + [PKG_CHECK_EXISTS(
52 + [QtCore],
53 + [
54 + PKG_CHECK_MODULES([QTCORE], [QtCore])
55 + # Paranoia: don't trust the result reported by pkg-config, but when
56 + # pkg-config reports that QtCore has been found, verify whether linking
57 + # programs with QtCore succeeds.
58 + AC_LANG(C++)
59 + safe_CXXFLAGS="${CXXFLAGS}"
60 + CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
61 + AC_TRY_LINK(
62 + [#include <QMutex>],
63 + [QMutex Mutex;],
64 + [ac_have_qtcore=yes],
65 + [
66 + AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
67 + ac_have_qtcore=no
68 + ]
69 + )
70 + CXXFLAGS="${safe_CXXFLAGS}"
71 + ],
72 + [
73 + ac_have_qtcore=no
74 + ]
75 + )
76 + ],
77 + AC_MSG_WARN([pkg-config has not been installed or is too old.])
78 + AC_MSG_WARN([Detection of Qt4 will be skipped.])
79 + [ac_have_qtcore=no]
80 + )
81 ]
82 - )
83 - ],
84 - AC_MSG_WARN([pkg-config has not been installed or is too old.])
85 - AC_MSG_WARN([Detection of Qt4 will be skipped.])
86 - [ac_have_qtcore=no]
87 )
88
89 AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])

  ViewVC Help
Powered by ViewVC 1.1.20