Enable D-Bus power management on Linux by default

This will probably work better out-of-the-box than the xdg thing.

CMakeLists.txt

@@ -17,19 +17,17 @@ endif()
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "" FORCE)
 
 option(OPENELEC "Make an OpenELEC build" OFF)
-option(LINUX_DBUS "Enable D-Bus power management" OFF)
+option(LINUX_X11POWER "Enable non D-Bus screensaver management" OFF)
 
-if(OPENELEC)
+if(NOT LINUX_X11POWER)
   set(LINUX_DBUS ON)
+endif()
+
+if(OPENELEC)
   add_definitions(-DKONVERGO_OPENELEC=1)
   Message(STATUS "Making an OpenELEC build")
 endif(OPENELEC)
 
-if(LINUX_DBUS)
-  add_definitions(-DLINUX_DBUS=1)
-  Message(STATUS "Enabling D-Bus power management")
-endif(LINUX_DBUS)
-
 if(BUILD_TARGET STREQUAL "RPI")
   add_definitions(-DTARGET_RPI=1)
   set(RPI_LIBS bcm_host)

CMakeModules/LinuxConfiguration.cmake

@@ -8,9 +8,12 @@ else()
   set(X11_Xrandr_LIB "")
 endif()
 
-if (NOT BUILD_TARGET STREQUAL "RPI")
-  set(USE_X11POWER ON)
+if(LINUX_X11POWER)
   add_definitions(-DUSE_X11POWER)
+  Message(STATUS "Enabling X11/XDG screensaver management")
+else()
+  add_definitions(-DLINUX_DBUS=1)
+  Message(STATUS "Enabling D-Bus power management")
 endif()
 
 set(INSTALL_BIN_DIR bin)