From cb262a2bbbb1fa07a20ff320581581a0cf7c9614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 18 Mar 2014 09:30:40 +0100
Subject: [PATCH] [kwin] Add used features from config-workspace.h to
 config-kwin.h

Adds HAVE_UNISTD_H and HAVE_MALLOC_H to config-kwin.h and gets used
in main.cpp. With that KWin does no longer need config-workspace.h.
---
 CMakeLists.txt      | 3 +++
 config-kwin.h.cmake | 6 ++++++
 main.cpp            | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2615fc47f9..ac7d20e4be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,9 @@ if(${HAVE_WAYLAND})
 else()
     set(HAVE_XKB FALSE)
 endif()
+
+check_include_files(unistd.h HAVE_UNISTD_H)
+check_include_files(malloc.h HAVE_MALLOC_H)
 configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h )
 
 
diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake
index d2a8c82577..951198ab36 100644
--- a/config-kwin.h.cmake
+++ b/config-kwin.h.cmake
@@ -11,3 +11,9 @@
 #cmakedefine01 HAVE_WAYLAND
 #cmakedefine01 HAVE_WAYLAND_EGL
 #cmakedefine01 HAVE_XKB
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#cmakedefine HAVE_MALLOC_H 1
diff --git a/main.cpp b/main.cpp
index 4b5a7675a8..c652876714 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #include "main.h"
-#include "config-workspace.h"
+#include <config-kwin.h>
 // kwin
 #include "atoms.h"
 #include "options.h"