Posted to tcl by schelte at Tue Jan 08 11:39:26 GMT 2013view pretty

--- configure.in.ORIG   2012-11-09 16:15:03.000000000 +0100
+++ configure.in        2013-01-08 10:25:12.000000000 +0100
@@ -457,6 +457,15 @@
 fi
 
 #--------------------------------------------------------------------
+# Check whether XKBlib.h is available
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no; then
+    AC_CHECK_HEADER(X11/XKBlib.h,
+        [AC_DEFINE(HAVE_XKBLIB_H, 1, [Do we have <X11/XKBlib.h>?])])
+fi
+
+#--------------------------------------------------------------------
 # Check whether the header and library for the XScreenSaver
 # extension are available, and set HAVE_XSS if so.
 # XScreenSaver is needed for Tk_GetUserInactiveTime().
--- tkUnixKey.c.ORIG    2012-11-06 16:08:56.000000000 +0100
+++ tkUnixKey.c 2013-01-08 11:46:18.000000000 +0100
@@ -11,7 +11,11 @@
  */
 
 #include "tkInt.h"
+#ifdef HAVE_XKBLIB_H
 #include <X11/XKBlib.h>
+#else
+#define XkbKeycodeToKeysym(dpy, kc, group, level) XKeycodeToKeysym(dpy, kc, level)
+#endif
 
 /*
  * Prototypes for local functions defined in this file: