diff options
| author | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-03-29 18:46:40 +0100 |
|---|---|---|
| committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-03-29 18:46:40 +0100 |
| commit | bde541308ee998fd3185500b4362bb404f51ee4c (patch) | |
| tree | 5eee0a9d8e7d44df5b15dd6a1c72326013bab091 /configure.ac | |
| parent | 8204551023d9b77294947a5170f3428fb5a4a225 (diff) | |
| download | ratpoison-bde541308ee998fd3185500b4362bb404f51ee4c.zip | |
Detect XKB support at build and runtime.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 36867cb..67adcb3 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,14 @@ fi AC_SUBST(XFT_CFLAGS) AC_SUBST(XFT_LIBS) +AC_ARG_WITH([xkb], + [AS_HELP_STRING([--disable-xkb], [Don't build XKB support for keyboard input.])], + [xkb=$withval], + [xkb=yes]) +AS_IF([test "X$xkb" = "Xyes"], + [AC_DEFINE([WANT_XKB], 1, + [Define to 1 if you want to build XKB support for keyboard input.])]) + AC_MSG_CHECKING([manpage format]) AC_ARG_ENABLE([mdoc], [AS_HELP_STRING([--disable-mdoc], @@ -151,9 +159,20 @@ AC_CHECK_HEADERS([X11/extensions/Xinerama.h], [], [], [ ]) CPPFLAGS="$mysavedCPPFLAGS" +mysavedCPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +AC_CHECK_HEADERS([X11/XKBlib.h], [], [], [ +#include <X11/Xlib.h> +]) +CPPFLAGS="$mysavedCPPFLAGS" + AC_CHECK_LIB(Xext, XMissingExtension, [X_LIBS="-lXext $X_LIBS"],,$X_LIBS $X_EXTRA_LIBS) AC_CHECK_LIB(Xinerama, XineramaQueryScreens, [X_LIBS="-lXinerama $X_LIBS"; AC_DEFINE(HAVE_LIBXINERAMA,1,[Xinerama])],,$X_LIBS $X_EXTRA_LIBS) AC_CHECK_LIB(Xtst, XTestFakeButtonEvent, [X_LIBS="-lXtst $X_LIBS"; AC_DEFINE(HAVE_LIBXTST,1,[Xtst])],,$X_LIBS $X_EXTRA_LIBS) +AC_CHECK_LIB([X11], [XkbKeycodeToKeysym], + [AC_DEFINE(HAVE_XKBKEYCODETOKEYSYM, 1, + [Define to 1 if you have the `XkbKeycodeToKeysym' function.])], + [], [$X_LIBS $X_EXTRA_LIBS]) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) |