Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/gnote/files: gnote-0.6.1-dbus-switch.patch
Date: Sun, 02 Aug 2009 22:42:09
Message-Id: E1MXjkk-0002td-Cb@stork.gentoo.org
1 eva 09/08/02 22:42:06
2
3 Added: gnote-0.6.1-dbus-switch.patch
4 Log:
5 Initial ebuild by Gilles Dartiguelongue <eva@g.o>, copied and bumped from gnome overlay, closes bug #268015.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gnote/files/gnote-0.6.1-dbus-switch.patch?rev=1.1&content-type=text/plain
13
14 Index: gnote-0.6.1-dbus-switch.patch
15 ===================================================================
16 From fa67c7f9f70b24edfec27e6d2023a4aeb15ee8dd Mon Sep 17 00:00:00 2001
17 From: Gilles Dartiguelongue <eva@g.o>
18 Date: Mon, 3 Aug 2009 00:06:15 +0200
19 Subject: [PATCH] Fix configure failure with --disable-dbus
20
21 AM_CONDITIONAL for HAVE_DBUS was badly placed resulting in configure
22 getting confused.
23
24 GNOME bug #590560
25 ---
26 configure.ac | 18 ++++++++++--------
27 1 files changed, 10 insertions(+), 8 deletions(-)
28
29 diff --git a/configure.ac b/configure.ac
30 index d9cf17a..f06deab 100644
31 --- a/configure.ac
32 +++ b/configure.ac
33 @@ -166,15 +166,17 @@ AC_LANG_POP
34 #
35 # Use DBus to export our remote control if available.
36 #
37 -AC_ARG_ENABLE(dbus,
38 - [ --enable-dbus[[=no/yes]] compile with dbus support [[default: yes]]],
39 - ENABLE_DBUS="$enableval", ENABLE_DBUS="yes")
40 -if test "x$ENABLE_DBUS" != "xno"; then
41 - PKG_CHECK_MODULES(DBUS, dbus-c++-1 >= $DBUSCPP_VERSION, [
42 - have_dbus="yes";AC_DEFINE([ENABLE_DBUS], [1], [Define to 1 if DBus is enabled])
43 - ], have_dbus="no")
44 - AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
45 +AC_ARG_ENABLE(dbus,
46 + AS_HELP_STRING([--enable-dbus],[compile with dbus support @<:@default: yes@:>@]),
47 + [],[enable_dbus=yes])
48 +
49 +if test "$enable_dbus" != "no"; then
50 + PKG_CHECK_MODULES(DBUS, dbus-c++-1 >= $DBUSCPP_VERSION, [
51 + have_dbus="yes"
52 + AC_DEFINE([ENABLE_DBUS], [1], [Define to 1 if DBus is enabled])
53 + ], have_dbus="no")
54 fi
55 +AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
56
57
58
59 --
60 1.6.3.3