Convert HAVE_DBUS to WITH_DBUS

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

configure.ac

@@ -1112,7 +1112,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"
@@ -1122,7 +1122,7 @@ if test "$with_dbus" = "yes" ; then
   LIBS="$save_LIBS"
   CFLAGS="$save_CFLAGS"
 fi
-AM_CONDITIONAL([HAVE_DBUS], [test "$with_dbus" = "yes"])
+AM_CONDITIONAL([WITH_DBUS], [test "$with_dbus" = "yes"])
 
 
 dnl PolicyKit library

src/nwfilter/nwfilter_driver.c

@@ -172,9 +172,9 @@ nwfilterDriverStartup(bool privileged ATTRIBUTE_UNUSED,
     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) {
         virReportOOMError();

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 DBusConnection *sessionbus = NULL;
@@ -223,7 +223,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,
@@ -237,5 +237,4 @@ DBusConnection *virDBusGetSessionBus(void)
                    "%s", _("DBus support not compiled into this binary"));
     return NULL;
 }
-
-#endif /* ! HAVE_DBUS */
+#endif /* ! WITH_DBUS */

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