build: Check for the XKB extension
When compiling the X11 backends.
This commit is contained in:
parent
698fd7d960
commit
fd65138589
2 changed files with 20 additions and 1 deletions
1
README
1
README
|
@ -28,6 +28,7 @@ On X11, Clutter depends on the following extensions
|
||||||
• XExt
|
• XExt
|
||||||
• XFixes
|
• XFixes
|
||||||
• XInput 1.x (if --enable-xinput is passed to configure)
|
• XInput 1.x (if --enable-xinput is passed to configure)
|
||||||
|
• XKB
|
||||||
|
|
||||||
When running the OpenGL flavor, Clutter requires at least version 1.3
|
When running the OpenGL flavor, Clutter requires at least version 1.3
|
||||||
or 1.2 with the multitexturing extension. However to build Clutter
|
or 1.2 with the multitexturing extension. However to build Clutter
|
||||||
|
|
20
configure.ac
20
configure.ac
|
@ -684,7 +684,7 @@ AS_IF([test "x$SUPPORT_XLIB" = "x1"],
|
||||||
|
|
||||||
[yes],
|
[yes],
|
||||||
[
|
[
|
||||||
AC_DEFINE(HAVE_XINPUT, 1, Use the XINPUT X extension)
|
AC_DEFINE(HAVE_XINPUT, 1, [Use the XINPUT X extension])
|
||||||
|
|
||||||
X11_LIBS="$X11_LIBS -lXi"
|
X11_LIBS="$X11_LIBS -lXi"
|
||||||
X11_PC_FILES="$X11_PC_FILES xi"
|
X11_PC_FILES="$X11_PC_FILES xi"
|
||||||
|
@ -694,6 +694,23 @@ AS_IF([test "x$SUPPORT_XLIB" = "x1"],
|
||||||
[],
|
[],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# XKB
|
||||||
|
clutter_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
|
||||||
|
|
||||||
|
clutter_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS $X11_LIBS"
|
||||||
|
|
||||||
|
have_xkb=no
|
||||||
|
AC_CHECK_FUNC([XkbQueryExtension],
|
||||||
|
[
|
||||||
|
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])
|
||||||
|
have_xkb=yes
|
||||||
|
])
|
||||||
|
|
||||||
|
CPPFLAGS="$clutter_save_CPPFLAGS"
|
||||||
|
LIBS="$clutter_save_LIBS"
|
||||||
|
|
||||||
x11_tests=yes
|
x11_tests=yes
|
||||||
BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES"
|
BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES"
|
||||||
FLAVOUR_LIBS="$FLAVOUR_LIBS $X11_LIBS"
|
FLAVOUR_LIBS="$FLAVOUR_LIBS $X11_LIBS"
|
||||||
|
@ -1136,6 +1153,7 @@ fi
|
||||||
|
|
||||||
if test "x$SUPPORT_XLIB" = "x1"; then
|
if test "x$SUPPORT_XLIB" = "x1"; then
|
||||||
echo " Enable XInput 1.0: ${xinput}"
|
echo " Enable XInput 1.0: ${xinput}"
|
||||||
|
echo " Enable XKB: ${have_xkb}"
|
||||||
echo " Enable X11 tests: ${x11_tests}"
|
echo " Enable X11 tests: ${x11_tests}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue