From 9ba6b2fc793b88e3d7775fe36a5915a96641b5da Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <SmSpillaz@gmail.com>
Date: Sat, 15 May 2010 12:54:32 +0800
Subject: Add necessary changes to compile without rpath usage

---
 plugins/switcher/src/switcher.cpp | 7 ++++---
 plugins/switcher/switcher.xml.in  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'plugins/switcher')

diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index d7a8f8c..6467fe1 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -1175,9 +1175,10 @@ SwitchWindow::SwitchWindow (CompWindow *window) :
 bool
 SwitchPluginVTable::init ()
 {
-    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
-        !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
-        !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
+    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
+        !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
+        !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
+        !CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI))
 	 return false;
 
     return true;
diff --git a/plugins/switcher/switcher.xml.in b/plugins/switcher/switcher.xml.in
index c29d2da..028a730 100644
--- a/plugins/switcher/switcher.xml.in
+++ b/plugins/switcher/switcher.xml.in
@@ -5,7 +5,9 @@
 	<category>Window Management</category>
 	<deps>
 	    <requirement>
+		<plugin>composite</plugin>
 		<plugin>opengl</plugin>
+		<plugin>compiztoolbox</plugin>
 	    </requirement>
 	</deps>
 	<options>
-- 
cgit v1.1