4 files changed, 21 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15f077d..739d036 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,8 @@ option( BUILD_ALL "Build all" ON )
 option( BUILD_DOC "Build documentation"         ${BUILD_ALL} )
 option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
 
+option( BUILD_KCM_AUTOSTART "Build kcm autostart" OFF )
+
 
 ##### configure checks
 
diff --git a/kiosktool/CMakeLists.txt b/kiosktool/CMakeLists.txt
index 3ac1c09..c8bf8ea 100644
--- a/kiosktool/CMakeLists.txt
+++ b/kiosktool/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory( kcms )
-
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -91,3 +89,8 @@ install(
     FILES kiosktool.desktop
     DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
+
+
+###### kcm modules
+
+add_subdirectory( kcms )
diff --git a/kiosktool/kcms/CMakeLists.txt b/kiosktool/kcms/CMakeLists.txt
index 4d25def..21a11a0 100644
--- a/kiosktool/kcms/CMakeLists.txt
+++ b/kiosktool/kcms/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory( autostart )
+tde_conditional_add_subdirectory( BUILD_KCM_AUTOSTART autostart )
diff --git a/kiosktool/kcms/autostart/CMakeLists.txt b/kiosktool/kcms/autostart/CMakeLists.txt
index 722a583..505dfaf 100644
--- a/kiosktool/kcms/autostart/CMakeLists.txt
+++ b/kiosktool/kcms/autostart/CMakeLists.txt
@@ -12,6 +12,19 @@ link_directories(
 )
 
 
+##### warning of possible collision
+
+message( AUTHOR_WARNING
+	" \n"
+	" ---------------------------------------------------------- \n"
+	" ***  NOTE  *** \n"
+	" The build of kcm autostart module is not recommended \n"
+	" because there is also a separate kcm-autostart application \n"
+	" with which the module would be in collision. \n"
+	" ---------------------------------------------------------- \n"
+)
+
+
 ##### kcm_autostart (kpart)
 
 tde_add_kpart( kcm_autostart AUTOMOC