Use a common test for dbus detection and paths configuration.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3c9bcf2134)

CMakeLists.txt

@@ -1037,33 +1037,10 @@ if( WITH_PCRE )
 endif( )
 
 
-##### set DBUS file locations ##################
+##### check for dbus and set files location #####
 
-if( NOT DEFINED DBUS_SYSTEM_CONF_DIRECTORY )
-  set (DBUS_SYSTEM_CONF_DIRECTORY "/etc/dbus-1/system.d/" )
-  message( STATUS "Using " ${DBUS_SYSTEM_CONF_DIRECTORY} " for DBUS configuration files" )
-endif( NOT DEFINED DBUS_SYSTEM_CONF_DIRECTORY )
+tde_setup_dbus( dbus-1-tqt )
 
-if( NOT DEFINED DBUS_SERVICE_DIRECTORY )
-  set (DBUS_SERVICE_DIRECTORY "/usr/share/dbus-1/system-services/" )
-  message( STATUS "Using " ${DBUS_SERVICE_DIRECTORY} " for DBUS service files" )
-endif( NOT DEFINED DBUS_SERVICE_DIRECTORY )
-
-
-##### check for dbus-1 ###########################
-pkg_search_module( DBUS dbus-1 )
-if( NOT DBUS_FOUND )
-  tde_message_fatal( "dbus-1 are required, but not found on your system" )
-endif( )
-
-
-##### check for dbus-1-tqt ###########################
-pkg_search_module( DBUS_TQT dbus-1-tqt )
-if( DBUS_TQT_FOUND )
-  find_program( DBUSXML2QT3_EXECUTABLE NAMES dbusxml2qt3 )
-else()
-  tde_message_fatal( "dbus-1-tqt are required, but not found on your system" )
-endif( )
 list( APPEND TDECORE_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )