[tomboy] configure: fix building on Debian and derivatives with DBus 2.0
- From: Alex Tereschenko <alexter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tomboy] configure: fix building on Debian and derivatives with DBus 2.0
- Date: Sun, 20 Nov 2016 13:01:58 +0000 (UTC)
commit 9bba6ac387dc1bdb08bc3a5957216259bdb1f509
Author: Alex Tereschenko <frozen and blue gmail com>
Date: Fri Nov 18 21:58:56 2016 +0100
configure: fix building on Debian and derivatives with DBus 2.0
Inspired by Debian's distro-level Tomboy source package patch
by Iain Lane <laney debian org>.
Fixes #9.
Signed-off-by: Alex Tereschenko <frozen and blue gmail com>
Tomboy/RemoteControlProxy.cs | 3 +--
configure.ac | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Tomboy/RemoteControlProxy.cs b/Tomboy/RemoteControlProxy.cs
index c142369..17cec27 100644
--- a/Tomboy/RemoteControlProxy.cs
+++ b/Tomboy/RemoteControlProxy.cs
@@ -55,8 +55,7 @@ namespace Tomboy
return null;
RemoteControl remote_control = new RemoteControl (manager);
- Bus.Session.Register (Namespace,
- new ObjectPath (Path),
+ Bus.Session.Register (new ObjectPath (Path),
remote_control);
return remote_control;
#else
diff --git a/configure.ac b/configure.ac
index 1057088..b52a100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,9 @@ AC_SUBST(DBUS_SERVICE_DIR)
#
# Check for dbus-sharp
#
-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
+PKG_CHECK_MODULES([DBUS], [dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3],, [
+ PKG_CHECK_MODULES([DBUS], [dbus-sharp-2.0 >= 0.4 dbus-sharp-glib-2.0 >= 0.3])
+])
AC_SUBST(DBUS_LIBS)
#
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]