Index: kalarm/CMakeLists.txt
===================================================================
--- kalarm/CMakeLists.txt	(revision 1050504)
+++ kalarm/CMakeLists.txt	(revision 1050505)
@@ -11,7 +11,13 @@
 ) 
 
 add_subdirectory( cal ) 
-add_subdirectory( akonadi ) 
+
+# Kalarm depend on kdepim/akonadi/ which is impossible for packagers.
+# the Akonadi resource for Kalarm won't be available in KDE 4.4
+if( BUILD_akonadi )
+  add_subdirectory( akonadi )
+endif( BUILD_akonadi )
+
 add_subdirectory( resources ) 
 add_subdirectory( appicons ) 
 add_subdirectory( pixmaps ) 
@@ -106,8 +112,10 @@
 endif (KMAIL_SUPPORTED)
 qt4_add_dbus_interfaces(kalarm_bin_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
 
-kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/akonadi/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
-qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml kalarmresourcesettings KAlarmResourceSettings)
+if( BUILD_akonadi )
+  kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/akonadi/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
+  qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml kalarmresourcesettings KAlarmResourceSettings)
+endif( BUILD_akonadi )
 
 kde4_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 1050504)
+++ CMakeLists.txt	(revision 1050505)
@@ -209,14 +209,19 @@
   macro_optional_add_subdirectory(akregator)
   macro_optional_add_subdirectory(blogilo)
   macro_optional_add_subdirectory(console)
+  macro_optional_add_subdirectory(kalarm)
   macro_optional_add_subdirectory(kjots)
   macro_optional_add_subdirectory(knotes)
   macro_optional_add_subdirectory(strigi-analyzer)
-
+    
   if(EXISTS ${CMAKE_SOURCE_DIR}/akonadi)
     macro_optional_add_subdirectory(akonadi)
   endif(EXISTS ${CMAKE_SOURCE_DIR}/akonadi)
 
+  if (BUILD_akonadi)
+    include_directories(${CMAKE_SOURCE_DIR}/akonadi ${CMAKE_BINARY_DIR}/akonadi)
+  endif (BUILD_akonadi)
+
   macro_optional_add_subdirectory(kaddressbook)
   if(Q_WS_X11)
     macro_optional_add_subdirectory(ktimetracker)
@@ -227,14 +232,6 @@
     macro_optional_add_subdirectory(kpilot)
   endif(NOT WIN32)
 
-  if (BUILD_akonadi)
-    include_directories(${CMAKE_SOURCE_DIR}/akonadi ${CMAKE_BINARY_DIR}/akonadi)
-
-    # Kalarm depend on kdepim/akonadi.
-    # that means these app won't compile for packagers. Disable them for anything else than a svn checkout.
-    macro_optional_add_subdirectory(kalarm)
-  endif (BUILD_akonadi)
-
   macro_optional_add_subdirectory(kontact) # must be the last one.
 
   # These targets depend on optional applications