Revert "CMake: Add scarabeus patch (rewrite of CMakeLists.h), fix warning"

This reverts commit e6db51d8fd.

src/config.h.in

@@ -35,11 +35,16 @@
 
 #include "wmfs.h"
 
-#define WMFS_VERSION         "@VERSION@"
-#define WMFS_COMPILE_MACHINE "@CMAKE_SYSTEM_PROCESSOR@"
-#define WMFS_COMPILE_BY      "@ENV{USER}@"
-#define WMFS_COMPILE_FLAGS   "@CMAKE_C_FLAGS@"
-#define WMFS_LINKED_LIBS     "@CMAKE_LINK_LIBRARIES@"
-#define XDG_CONFIG_DIR       "@CMAKE_XDGCONFDIR@"
+#define WMFS_VERSION         "@WMFS_VERSION@"
+#define WMFS_COMPILE_MACHINE "@WMFS_COMPILE_MACHINE@"
+#define WMFS_COMPILE_BY      "@WMFS_COMPILE_BY@"
+#define WMFS_COMPILE_FLAGS   "@WMFS_COMPILE_FLAGS@"
+#define WMFS_LINKED_LIBS     "@WMFS_LINKED_LIBS@"
+#define XDG_CONFIG_DIR       "@XDG_CONFIG_DIR@"
+
+/* Optional dependencies */
+@WMFS_HAVE_XINERAMA@
+@WMFS_HAVE_XRANDR@
+@WMFS_HAVE_IMLIB@
 
 #endif /* CONFIG_H */

src/wmfs.h

@@ -34,7 +34,7 @@
 #define WMFS_H
 
 #define _BSD_SOURCE /* vsnprintf */
-
+#define _POSIX_SOURCE /* kill */
 /* Lib headers */
 #include <stdio.h>
 #include <stdlib.h>