From 3c75381e05b6443906527f2c2513455309578ea8 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Sun, 6 Apr 2014 03:46:07 +0400
Subject: Remove useless cmake configuration options WITH_XEXT and WITH_XDAMAGE

---
 CMakeLists.txt                  |  8 --------
 ConfigureChecks.cmake           | 34 ++++++++++++++--------------------
 twin/compton-tde/CMakeLists.txt |  4 ----
 twin/kompmgr/CMakeLists.txt     |  4 ----
 4 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1b7e79bd..35ff873d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,8 +71,6 @@ option( WITH_XCURSOR "Enable xcursor support" ${WITH_ALL_OPTIONS} )
 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 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # 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 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # 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 ca0e235b0..bd37b3477 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -102,6 +102,20 @@ if( WITH_XCOMPOSITE )
   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( )
 
 
@@ -116,26 +130,6 @@ if( WITH_XFIXES )
 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( )
-
-
 # libconfig (twin/compton-tde)
 if( WITH_LIBCONFIG )
   pkg_search_module( LIBCONFIG libconfig )
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt
index 7d4f9ace4..8153e7c84 100644
--- a/twin/compton-tde/CMakeLists.txt
+++ b/twin/compton-tde/CMakeLists.txt
@@ -16,10 +16,6 @@ elseif( NOT WITH_XRANDR )
   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 0cc2e5616..e2eb0c186 100644
--- a/twin/kompmgr/CMakeLists.txt
+++ b/twin/kompmgr/CMakeLists.txt
@@ -14,10 +14,6 @@ if( NOT WITH_XRENDER )
   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( )
 
 
-- 
cgit v1.2.1