projects
/
platform
/
upstream
/
at-spi2-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dependency on libxkbcommon
[platform/upstream/at-spi2-core.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
3ee2cf5
..
850f808
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-AC_INIT([at-spi2-core], [2.2
5.4
], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.2
6.0
], [accessibility-atspi@lists.linux-foundation.org])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
@@
-107,11
+107,9
@@
AS_IF([test "x$enable_x11" = xno], [
X11_LIBS="$X11_LIBS $XINPUT_LIBS"
# XKB (optional)
X11_LIBS="$X11_LIBS $XINPUT_LIBS"
# XKB (optional)
-
PKG_CHECK_MODULES(XKB, [xkbcommon-x11]
, [
+
AC_CHECK_LIB(X11, XkbGetMap
, [
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB])
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB])
- X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS"
- X11_LIBS="$X11_LIBS $XKB_LIBS"
- ], [])
+ ], [:])
])
AC_SUBST(X11_CFLAGS)
])
AC_SUBST(X11_CFLAGS)