Remove useless cmake configuration options WITH_XEXT and WITH_XDAMAGE

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1b7e79..35ff873 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,8 +71,6 @@
 option( WITH_XFIXES "Enable xfixes support" ${WITH_ALL_OPTIONS} )
 option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )
 option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
-option( WITH_XDAMAGE "Enable xdamage support" ${WITH_ALL_OPTIONS} )
-option( WITH_XEXT "Enable xext support" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} )
 option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
 option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
@@ -104,8 +102,6 @@
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
 # WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
 # WITH_XFIXES       affects twin klipper kicker(taskmanager)
-# WITH_XDAMAGE      affects <nothing>
-# WITH_XEXT         affects <nothing>
 # WITH_XRANDR       affects tdm, kcontrol(displayconfig randr iccconfig)
 # WITH_XRENDER      affects twin konsole kicker(taskmanager) kdesktop
 #                           kcontrol(style)
@@ -136,10 +132,6 @@
 # NOTE: if WITH_XCOMPOSITE=ON then the following options are also required:
 #       WITH_XRENDER=ON
 #       WITH_XFIXES=ON
-#       WITH_XDAMAGE=ON
-#       WITH_XEXT=ON
-# NOTE: seems WITH_XDAMAGE and WITH_XET doesn't change anything
-#       they are just required by WITH_XCOMPOSITE
 
 ##### user requested modules ####################
 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ca0e235..bd37b34 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -102,6 +102,20 @@
   else( XCOMPOSITE_FOUND )
     tde_message_fatal( "xcomposite is requested, but was not found on your system" )
   endif( XCOMPOSITE_FOUND )
+
+
+  # xdamage (twin/kompmgr)
+  pkg_search_module( XDAMAGE xdamage )
+  if( NOT XDAMAGE_FOUND )
+    tde_message_fatal( "xdamage is required for xcomposite support, but was not found on your system" )
+  endif( )
+
+  # xext (twin/kompmgr)
+  pkg_search_module( XEXT xext )
+  if( NOT XEXT_FOUND )
+    tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )
+  endif( )
+
 endif( )
 
 
@@ -112,26 +126,6 @@
     set( HAVE_XFIXES 1 CACHE INTERNAL "" FORCE )
   else( )
     tde_message_fatal( "xfixes is requested, but was not found on your system" )
-  endif( )
-endif( )
-
-
-# xdamage (twin/kompmgr)
-if( WITH_XDAMAGE )
-  pkg_search_module( XDAMAGE xdamage )
-  if( NOT XDAMAGE_FOUND )
-    tde_message_fatal( "xdamage is requested, but was not found on your system" )
-  endif( )
-endif( )
-
-
-# xext (twin/kompmgr)
-if( WITH_XEXT )
-  pkg_search_module( XEXT xext )
-  if( XEXT_FOUND )
-    set( HAVE_XEXT 1 )
-  else( XEXT_FOUND )
-    tde_message_fatal( "xext is requested, but was not found on your system" )
   endif( )
 endif( )
 
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt
index 7d4f9ac..8153e7c 100644
--- a/twin/compton-tde/CMakeLists.txt
+++ b/twin/compton-tde/CMakeLists.txt
@@ -16,10 +16,6 @@
   tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )
 elseif( NOT WITH_XFIXES )
   tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
-elseif( NOT WITH_XDAMAGE )
-  tde_message_fatal( "xdamage support is needed to build compton-tde.\n Pass -DWITH_XDAMAGE=ON to cmake arguments." )
-elseif( NOT WITH_XEXT )
-  tde_message_fatal( "xext support is needed to build compton-tde.\n Pass -DWITH_XEXT=ON to cmake arguments." )
 elseif( NOT WITH_XINERAMA )
   tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XINERAMA=ON to cmake arguments." )
 elseif( NOT WITH_LIBCONFIG )
diff --git a/twin/kompmgr/CMakeLists.txt b/twin/kompmgr/CMakeLists.txt
index 0cc2e56..e2eb0c1 100644
--- a/twin/kompmgr/CMakeLists.txt
+++ b/twin/kompmgr/CMakeLists.txt
@@ -14,10 +14,6 @@
   tde_message_fatal( "xrender support is needed to build kompmgr.\n Pass -DWITH_XRENDER=ON to cmake arguments." )
 elseif( NOT WITH_XFIXES )
   tde_message_fatal( "xfixes support is needed to build kompmgr.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
-elseif( NOT WITH_XDAMAGE )
-  tde_message_fatal( "xdamage support is needed to build kompmgr.\n Pass -DWITH_XDAMAGE=ON to cmake arguments." )
-elseif( NOT WITH_XEXT )
-  tde_message_fatal( "xext support is needed to build kompmgr.\n Pass -DWITH_XEXT=ON to cmake arguments." )
 endif( )
 
 

Move the XRandr test to main ConfigureChecks.cmake

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index bd37b34..757916a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -83,6 +83,15 @@
 endif( )
 
 
+# xrender (kcontrol, twin)
+if( WITH_XRANDR )
+  pkg_search_module( XRANDR xrandr )
+  if( NOT XRANDR_FOUND )
+    tde_message_fatal( "xrandr are requested, but not found on your system" )
+  endif( )
+endif( )
+
+
 # xcursor (tdeioslave, kcontrol)
 if( WITH_XCURSOR )
   pkg_search_module( XCURSOR xcursor )
diff --git a/kcontrol/ConfigureChecks.cmake b/kcontrol/ConfigureChecks.cmake
index 1ff4f06..9676dba 100644
--- a/kcontrol/ConfigureChecks.cmake
+++ b/kcontrol/ConfigureChecks.cmake
@@ -45,16 +45,6 @@
 endif( )
 
 
-##### check for Xrandr ##########################
-
-if( WITH_XRANDR )
-  pkg_search_module( XRANDR xrandr )
-  if( NOT XRANDR_FOUND )
-    tde_message_fatal( "xrandr are requested, but not found on your system" )
-  endif( )
-endif( )
-
-
 ##### check for libusb ##########################
 
 if( WITH_LIBUSB )

twin/compton-tde: transparent pass TDE build-time configure options to compot-tde

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35ff873..cddd67f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@
 option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )
 option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} )
+option( WITH_PCRE "Enable pcre regex support" ON )
 option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
 option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
 option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
@@ -124,6 +125,8 @@
 # WITH_PAM          affects tdm kdesktop kcheckpass
 # WITH_SHADOW       affects tdm kcheckpass
 # WITH_UPOWER       affects ksmserver
+# WITH_LIBCONFIG    affects twin/compot-tde
+# WITH_PCRE         affects twin/compot-tde
 # WITH_SUDO_TDESU_BACKEND affects tdesu
 # WITH_SUDO_KONSOLE_SUPER_USER_COMMAND affects launching Konsole super user sessions
 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 757916a..34aff70 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -83,7 +83,7 @@
 endif( )
 
 
-# xrender (kcontrol, twin)
+# xrandr (kcontrol)
 if( WITH_XRANDR )
   pkg_search_module( XRANDR xrandr )
   if( NOT XRANDR_FOUND )
@@ -144,12 +144,22 @@
   pkg_search_module( LIBCONFIG libconfig )
   if( LIBCONFIG_FOUND )
     set( HAVE_LIBCONFIG 1 )
-    if( LIBCONFIG_VERSION VERSION_LESS 1.5.0 )
+    # TODO replace with functionality check
+    if( LIBCONFIG_VERSION VERSION_LESS 1.4.0 )
       set( HAVE_LIBCONFIG_OLD_API 1 )
     endif( )
   else( LIBCONFIG_FOUND )
     tde_message_fatal( "libconfig is requested, but was not found on your system" )
   endif( )
+endif( )
+
+
+# pcre (twin/compton-tde)
+if( WITH_PCRE )
+  pkg_search_module( LIBPCRE libpcre )
+  if( NOT LIBPCRE_FOUND )
+    tde_message_fatal( "pcre support is requested, but not found on your system" )
+  endif( NOT LIBPCRE_FOUND )
 endif( )
 
 
@@ -196,7 +206,7 @@
 endif( )
 
 
-# openGL (kdesktop or kcontrol or tdescreensaver )
+# openGL (kdesktop or kcontrol or tdescreensaver or twin/compot-tde )
 if( WITH_OPENGL )
   pkg_search_module( GL gl )
   if( GL_FOUND )
@@ -297,8 +307,8 @@
 
 
 
-# dbus (tdm, kdesktop)
-if( BUILD_TDM OR BUILD_KDESKTOP )
+# dbus (tdm, kdesktop, twin/compton-tde.c)
+if( BUILD_TDM OR BUILD_KDESKTOP OR (BUILD_TWIN AND WITH_XCOMPOSITE) )
 
   pkg_search_module( DBUS dbus-1 )
   if( NOT DBUS_FOUND )
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt
index 8153e7c..f73f09e 100644
--- a/twin/compton-tde/CMakeLists.txt
+++ b/twin/compton-tde/CMakeLists.txt
@@ -16,57 +16,70 @@
   tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )
 elseif( NOT WITH_XFIXES )
   tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
-elseif( NOT WITH_XINERAMA )
-  tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XINERAMA=ON to cmake arguments." )
-elseif( NOT WITH_LIBCONFIG )
-  tde_message_fatal( "libconfig support is needed to build compton-tde.\n Pass -DWITH_LIBCONFIG=ON to cmake arguments." )
 endif( )
-
 
 include_directories(
 ** Diff limit reached (max: 250 lines) **

Move the Xinerama test to main ConfigureChecks.cmake

 ** Diff limit reached (max: 250 lines) **

twin/compton-tde: make XRandR support optional in compot-tde

 ** Diff limit reached (max: 250 lines) **

twin/compton: make CONFIG_XSYNC autoconfigurable to fix FTBFS with older libXext versions which doesn't provide XSyncFence

 ** Diff limit reached (max: 250 lines) **