Move cpp conditional check for AVOID_XKB to CMake.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1107581

src/CMakeLists.txt

@@ -8,6 +8,12 @@ include(CheckIncludeFiles)
 check_include_files("sys/proc.h"      HAVE_SYS_PROC_H)
 check_include_files("sys/proc_info.h" HAVE_SYS_PROC_INFO_H)
 
+if (APPLE OR OSF)
+    SET(HAVE_AVOID_XKB TRUE)
+endif (APPLE OR OSF)
+
+macro_bool_to_01(HAVE_AVOID_XKB AVOID_XKB)
+
 configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h )
 
 ############### Load the CTest options ###############

src/Vt102Emulation.cpp

@@ -25,9 +25,6 @@
 
 // XKB
 #include <config-konsole.h>
-#if defined(__osf__) || defined(__APPLE__)
-    #define AVOID_XKB
-#endif
 
 // this allows konsole to be compiled without XKB and XTEST extensions
 // even though it might be available on a particular system.

src/config-konsole.h.cmake

@@ -12,3 +12,6 @@
 
 /* Defined if you have sys/proc_info.h */
 #cmakedefine HAVE_SYS_PROC_INFO_H 1
+
+/* Define if you have the do NOT want the XKB extension */
+#cmakedefine AVOID_XKB 1