Ifdef the broken dbus code better.

Makefile.common

@@ -899,7 +899,6 @@ endif
 ifeq ($(HAVE_X11), 1)
    OBJ += input/common/input_x11_common.o \
           input/drivers/x11_input.o \
-			 gfx/common/dbus_common.o \
           gfx/common/x11_common.o \
 			 gfx/common/xinerama_common.o
 
@@ -927,6 +926,7 @@ endif
 ifeq ($(HAVE_DBUS), 1)
 	LIBS += $(DBUS_LIBS)
 	CFLAGS += $(DBUS_CFLAGS)
+	OBJ += gfx/common/dbus_common.o
 endif
 
 ifeq ($(HAVE_UDEV), 1)

gfx/common/x11_common.c

@@ -40,7 +40,9 @@
 
 #include <encodings/utf.h>
 
+#ifdef HAVE_DBUS
 #include "dbus_common.h"
+#endif
 
 #include "../../frontend/frontend_driver.h"
 #include "../../input/input_driver.h"
@@ -604,7 +606,9 @@ bool x11_connect(void)
          return false;
    }
 
+#ifdef HAVE_DBUS
    dbus_ensure_connection();
+#endif
 
    return true;
 }

griffin/griffin.c

@@ -251,9 +251,12 @@ VIDEO CONTEXT
 
 #if defined(HAVE_X11)
 #include "../gfx/common/x11_common.c"
-#include "../gfx/common/dbus_common.c"
 #include "../gfx/common/xinerama_common.c"
 
+#ifdef HAVE_DBUS
+#include "../gfx/common/dbus_common.c"
+#endif
+
 #ifndef HAVE_OPENGLES
 #include "../gfx/drivers_context/x_ctx.c"
 #endif

qb/config.params.sh

@@ -18,7 +18,7 @@ HAVE_SDL2=auto             # SDL2 support (disables SDL 1.x)
 C89_SDL2=no
 HAVE_LIBUSB=auto           # Libusb HID support
 C89_LIBUSB=no
-HAVE_DBUS=auto             # dbus support
+HAVE_DBUS=no               # dbus support
 HAVE_SYSTEMD=auto          # Systemd support
 HAVE_UDEV=auto             # Udev/Evdev gamepad support
 HAVE_THREADS=auto          # Threading support