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

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