[libvirt] [PATCH 20/29] Convert HAVE_DBUS to WITH_DBUS

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- configure.ac | 4 ++-- src/nwfilter/nwfilter_driver.c | 4 ++-- src/util/virdbus.c | 6 +++--- src/util/virdbus.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 141d321..07ddecc 100644 --- a/configure.ac +++ b/configure.ac @@ -1063,7 +1063,7 @@ if test "$with_dbus" = "yes" || test "$with_dbus" = "check" ; then fi if test "$with_dbus" = "yes" ; then - AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, [enable communication with DBus]) + AC_DEFINE_UNQUOTED([WITH_DBUS], 1, [enable communication with DBus]) save_LIBS="$LIBS" save_CFLAGS="$CFLAGS" @@ -1073,7 +1073,7 @@ if test "$with_dbus" = "yes" ; then LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" fi -AM_CONDITIONAL([HAVE_DBUS], [test "$have_dbus" = "yes"]) +AM_CONDITIONAL([WITH_DBUS], [test "$have_dbus" = "yes"]) dnl PolicyKit library diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index d2f8c69..772c477 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -170,9 +170,9 @@ nwfilterDriverStartup(int privileged) char *base = NULL; DBusConnection *sysbus = NULL; -#if HAVE_DBUS +#if WITH_DBUS sysbus = virDBusGetSystemBus(); -#endif /* HAVE_DBUS */ +#endif /* WITH_DBUS */ if (VIR_ALLOC(driverState) < 0) goto alloc_err_exit; diff --git a/src/util/virdbus.c b/src/util/virdbus.c index da1b143a..3e8642c 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -29,7 +29,7 @@ #define VIR_FROM_THIS VIR_FROM_DBUS -#ifdef HAVE_DBUS +#ifdef WITH_DBUS static DBusConnection *systembus = NULL; static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER; @@ -186,7 +186,7 @@ static void virDBusToggleWatch(DBusWatch *watch, (void)virEventUpdateHandle(info->watch, flags); } -#else /* ! HAVE_DBUS */ +#else /* ! WITH_DBUS */ DBusConnection *virDBusGetSystemBus(void) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -194,4 +194,4 @@ DBusConnection *virDBusGetSystemBus(void) return NULL; } -#endif /* ! HAVE_DBUS */ +#endif /* ! WITH_DBUS */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 92d0db0..bdcc329 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -22,7 +22,7 @@ #ifndef __VIR_DBUS_H__ # define __VIR_DBUS_H__ -# ifdef HAVE_DBUS +# ifdef WITH_DBUS # include <dbus/dbus.h> # else # define DBusConnection void -- 1.7.11.4