Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 36 insertions, 23 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37a05bf5c..ac1ecf1a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
 OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
+OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
 OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
@@ -745,7 +745,7 @@ endif( )
 # before altering the LIBR_VERSION check,
 # please ensure that nothing changed in the
 # duplicated data definitions present in
-# kio/kio/kfileitem.cpp
+# tdeio/tdeio/tdefileitem.cpp
 
 if( WITH_ELFICON )
   pkg_search_module( LIBR libr )
@@ -770,6 +770,19 @@ if( WITH_PCRE )
 endif( )
 
 
+##### set DBUS file locations ##################
+
+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 )
+
+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 )
+
+
 if( WITH_NETWORK_MANAGER_BACKEND )
   ##### check for dbus-1 ###########################
   pkg_search_module( DBUS dbus-1 )
@@ -873,7 +886,7 @@ configure_file( config.h.cmake config.h )
 configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
 configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
 configure_file( kjs/global.h.in kjs/global.h )
-configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
+configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
 
 
@@ -882,7 +895,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
 set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
 set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
 set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
-set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )
+set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/tdeconfig_compiler/tdeconfig_compiler )
 
 
 ##### global compiler settings ##################
@@ -919,12 +932,12 @@ add_subdirectory( tdecore )
 if( WITH_ELFICON )
   add_subdirectory( tdelfeditor )
 endif( WITH_ELFICON )
-add_subdirectory( kunittest )
+add_subdirectory( tdeunittest )
 add_subdirectory( tdeui )
 add_subdirectory( tdesu )
 add_subdirectory( kjs )
-add_subdirectory( kwallet )
-add_subdirectory( kio )
+add_subdirectory( tdewallet )
+add_subdirectory( tdeio )
 add_subdirectory( kded )
 
 # FIXME this directory/target doesn't exists
@@ -932,39 +945,39 @@ add_subdirectory( kded )
 
 add_subdirectory( kdoctools )
 add_subdirectory( doc )
-add_subdirectory( kparts )
-add_subdirectory( kutils )
-add_subdirectory( kspell2 )
-add_subdirectory( kmdi )
+add_subdirectory( tdeparts )
+add_subdirectory( tdeutils )
+add_subdirectory( tdespell2 )
+add_subdirectory( tdemdi )
 add_subdirectory( kinit )
 add_subdirectory( tdeprint )
 add_subdirectory( kab )
-add_subdirectory( kresources )
-add_subdirectory( kabc )
+add_subdirectory( tderesources )
+add_subdirectory( tdeabc )
 add_subdirectory( arts )
 add_subdirectory( interfaces )
 add_subdirectory( kate )
-add_subdirectory( kcert )
+add_subdirectory( tdecert )
 if( XRANDR_FOUND )
-  add_subdirectory( krandr )
+  add_subdirectory( tderandr )
 endif( XRANDR_FOUND )
-add_subdirectory( khtml )
-add_subdirectory( kcmshell )
-add_subdirectory( kconf_update )
+add_subdirectory( tdehtml )
+add_subdirectory( tdecmshell )
+add_subdirectory( tdeconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kstyles )
-add_subdirectory( libkmid )
-add_subdirectory( libkscreensaver )
+add_subdirectory( libtdemid )
+add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )
 add_subdirectory( knewstuff )
-add_subdirectory( krsync )
+add_subdirectory( tdersync )
 add_subdirectory( licenses )
 add_subdirectory( dnssd )
 add_subdirectory( pics )
 add_subdirectory( mimetypes )
-add_subdirectory( kfile-plugins )
+add_subdirectory( tdefile-plugins )
 
 
 ##### install import cmake modules ###############