From 58bbbb5fe69bd0c2badaf679c1d973f141da6daf Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Thu, 3 Nov 2011 11:06:05 +0100
Subject: [PATCH 1/3] make kutils linking properly conditional, use proper libs
 vars for other libraries too

---
 CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3effae145..68c7307ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${KDE4_KDEUI_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
                     ${CMAKE_BINARY_DIR}/experimental/libkdeclarative
-                    ${CMAKE_SOURCE_DIR}/kutils
                     ${CMAKE_SOURCE_DIR}/threadweaver
                     ${CMAKE_SOURCE_DIR}/plasma/extenders
                     ${CMAKE_SOURCE_DIR}/plasma/remote
@@ -44,6 +43,11 @@ if(NOT PLASMA_NO_SOLID)
     set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
 endif(NOT PLASMA_NO_SOLID)
 
+if (NOT PLASMA_NO_KUTILS)
+    include_directories(${CMAKE_SOURCE_DIR}/kutils)
+    set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS})
+endif(NOT PLASMA_NO_KUTILS)
+
 if(QCA2_FOUND)
     include_directories(${QCA2_INCLUDE_DIR})
     set(ENABLE_REMOTE_WIDGETS TRUE)
@@ -263,7 +267,7 @@ kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
 #add kdeclarative after the 4.7 release
 target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
                              ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
-                             ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS})
+                             ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
 
 if(QCA2_FOUND)
    target_link_libraries(plasma ${QCA2_LIBRARIES})

From ee75cfc1c8cdeb56cadb8510d66c1e6fa7f43a74 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Thu, 3 Nov 2011 12:15:27 +0100
Subject: [PATCH 2/3] add the variable to the c++ env

---
 config-plasma.h.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config-plasma.h.cmake b/config-plasma.h.cmake
index 5edfe18a3..ebce7422b 100644
--- a/config-plasma.h.cmake
+++ b/config-plasma.h.cmake
@@ -5,4 +5,5 @@
 #cmakedefine PLASMA_NO_KNEWSTUFF
 #cmakedefine PLASMA_NO_SOLID
 #cmakedefine PLASMA_NO_KIO
+#cmakedefine PLASMA_NO_KUTILS
 

From f38425761a8b461a1e294204de31603c268641bb Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Thu, 3 Nov 2011 12:15:52 +0100
Subject: [PATCH 3/3] a missing include

---
 applet.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applet.cpp b/applet.cpp
index edafe2f6e..c99cdecaa 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -69,6 +69,8 @@
 #ifndef PLASMA_NO_KUTILS
 #include <kcmoduleinfo.h>
 #include <kcmoduleproxy.h>
+#else
+#include <kcmodule.h>
 #endif
 
 #ifndef PLASMA_NO_SOLID