diff options
| author | stwo <stwo> | 2013-01-31 11:49:40 (GMT) |
|---|---|---|
| committer | stwo <stwo> | 2013-01-31 11:49:40 (GMT) |
| commit | f87865465eb042e0a72a84cffe3f1a9f60da99e6 (patch) | |
| tree | 2b7a02eff512dc58baeb018bcc88c60535091845 /unix/configure.in | |
| parent | b759e66206f54d4053c05aa250fd24e14809407e (diff) | |
| download | tk-f87865465eb042e0a72a84cffe3f1a9f60da99e6.zip tk-f87865465eb042e0a72a84cffe3f1a9f60da99e6.tar.gz tk-f87865465eb042e0a72a84cffe3f1a9f60da99e6.tar.bz2 | |
Bug [3599928]: Use XkbKeycodeToKeysym if available.
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/unix/configure.in b/unix/configure.in index e199eaf..86d46ad 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -530,6 +530,36 @@ if test $tk_aqua = no; then fi #-------------------------------------------------------------------- +# Check for XkbKeycodeToKeysym. +#-------------------------------------------------------------------- + +if test $tk_aqua = no; then + tk_oldCFlags=$CFLAGS + tk_oldLibs=$LIBS + CFLAGS="$CFLAGS $XINCLUDES" + LIBS="$LIBS $XLIBSW" + AC_CHECK_HEADER(X11/XKBlib.h, [ + xkblib_header_found=yes + ], [ + xkblib_header_found=no + ], [#include <X11/Xlib.h>]) + if test $xkblib_header_found = "yes" ; then + AC_CHECK_LIB(X11, XkbKeycodeToKeysym, [ + xkbkeycodetokeysym_found=yes + ], [ + xkbkeycodetokeysym_found=no + ]) + else + xkbkeycodetokeysym_found=no + fi + if test $xkbkeycodetokeysym_found = "yes" ; then + AC_DEFINE(HAVE_XKBKEYCODETOKEYSYM, 1, [Do we have XkbKeycodeToKeysym?]) + fi + CFLAGS=$tk_oldCFlags + LIBS=$tk_oldLibs +fi + +#-------------------------------------------------------------------- # XXX Do this last. # It might modify XLIBSW which could affect other tests. # |