Merge lp:~aacid/compiz/kde_needs_kdeworkspace into lp:compiz/0.9.8

[Albert Astals Cid]

Also need kdeworkspace since kdecorationbridge.h is there

Also need kdeworkspace since kdecorationbridge.h is there as you can see in http://packages.ubuntu.com/quantal/amd64/kde-workspace-dev/filelist

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3346
http://jenkins.qa.ubuntu.com/job/compiz-ci/54/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/54/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3346
http://jenkins.qa.ubuntu.com/job/compiz-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/55/console

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'kde/window-decorator-kde4/CMakeLists.txt'
--- kde/window-decorator-kde4/CMakeLists.txt	2012-09-03 07:19:30 +0000
+++ kde/window-decorator-kde4/CMakeLists.txt	2012-09-07 13:52:26 +0000
@@ -7,8 +7,9 @@
 if (USE_KDE4)
 
     find_package(KDE4 4.3.0)
+    find_package(KDE4Workspace)
 
-    if (KDE4_FOUND)
+    if (KDE4_FOUND AND KDE4Workspace_FOUND)
         include(KDE4Defaults)
 	include(FindPkgConfig)
 	include(MacroLibrary)
@@ -71,8 +72,8 @@
 	    DESTINATION ${exec_prefix}
 	)
 
-    else (KDE4_FOUND)
+    else (KDE4_FOUND AND KDE4Workspace_FOUND)
 	compiz_set (USE_KDE4 0)
-    endif (KDE4_FOUND)
+    endif (KDE4_FOUND AND KDE4Workspace_FOUND)
 
 endif (USE_KDE4)