[blam/blam-1.8.10: 1/2] Fix dbus detection
- From: Carlos MartÃn Nieto <cmartin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [blam/blam-1.8.10: 1/2] Fix dbus detection
- Date: Sun, 4 Dec 2011 13:00:14 +0000 (UTC)
commit 6e7fd652ed1ae6500dd879780c9d2c6bbce2c672
Author: GÃtz Waschk <waschk mandriva org>
Date: Sun Dec 4 13:37:15 2011 +0100
Fix dbus detection
There were some more logical bugs in the check, e.g. a missing 'x' before the
variable and it also must set the right variables.
configure.in | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2a2813f..84486d1 100644
--- a/configure.in
+++ b/configure.in
@@ -61,22 +61,22 @@ AC_ARG_WITH([dbus],
with_dbus=auto
)
# In auto mode, prefer dbus-sharp
-PKG_CHECK_EXISTS([dbus-sharp-1.0], DBUS_SHARP_SUPPORT=yes, DBUS_SHARP_SUPPORT=no)
+PKG_CHECK_EXISTS([dbus-sharp-glib-1.0], DBUS_SHARP_SUPPORT=yes, DBUS_SHARP_SUPPORT=no)
PKG_CHECK_EXISTS([ndesk-dbus-1.0], NDESK_DBUS_SUPPORT=yes, NDESK_DBUS_SUPPORT=no)
if test "x$with_dbus" = "xauto"; then
- if test "$DBUS_SHARP_SUPPORT" = "xyes"; then
- ENABLE_DBUS=$DBUS_SHARP_SUPPORT
+ if test "x$DBUS_SHARP_SUPPORT" = "xyes"; then
+ ENABLE_DBUS=$DBUS_SHARP_SUPPORT;ENABLE_DBUS_SHARP="yes"
else
- ENABLE_DBUS=$NDESK_DBUS_SUPPORT
+ ENABLE_DBUS=$NDESK_DBUS_SUPPORT;ENABLE_NDESK_DBUS="yes"
fi
fi
# If we found a package or the user told us
if test "x$with_dbus" = "xyes"; then
if test "x$DBUS_SHARP_SUPPORT" = "xyes"; then
- PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-glib-1.0, ENABLE_NDESK_DBUS="yes", ENABLE_NDESK_DBUS="no")
+ PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-glib-1.0, ENABLE_DBUS_SHARP="yes", ENABLE_DBUS_SHARP="no")
AC_SUBST(DBUS_LIBS, "$DBUS_SHARP_LIBS")
else
- PKG_CHECK_MODULES(DBUS_NDESK, ndesk-dbus-glib-1.0, ENABLE_DBUS_SHARP="yes", ENABLE_DBUS_SHARP="no")
+ PKG_CHECK_MODULES(DBUS_NDESK, ndesk-dbus-glib-1.0, ENABLE_NDESK_DBUS="yes", ENABLE_NDESK_DBUS="no")
AC_SUBST(DBUS_LIBS, "$DBUS_NDESK_LIBS")
fi
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]