--- CMakeLists.txt.orig	2012-10-25 09:20:57.773606598 +0400
+++ CMakeLists.txt	2012-10-26 07:18:14.793762688 +0400
@@ -81,5 +81,6 @@
 OPTION( WITH_ASPELL "Enable aspell support" OFF )
 OPTION( WITH_HSPELL "Enable hspell support" OFF )
+OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
 
 
 ##### set PKG_CONFIG_PATH #######################
@@ -564,10 +565,14 @@
 
 ##### check for xcomposite #########################
 
-pkg_search_module( XCOMPOSITE xcomposite )
-if( XCOMPOSITE_FOUND )
-  set( HAVE_XCOMPOSITE 1 )
-endif( XCOMPOSITE_FOUND )
+if( WITH_XCOMPOSITE )
+  pkg_search_module( XCOMPOSITE xcomposite )
+  if( XCOMPOSITE_FOUND )
+    set( HAVE_XCOMPOSITE 1 )
+  else()
+    message(FATAL_ERROR "\nxcomposite support was requested, but xcomposite was not found on your system" )
+  endif( XCOMPOSITE_FOUND )
+endif( WITH_XCOMPOSITE )
 
 ##### check for libxml-2.0 ######################