Redefine universal-switch vconf keys.

[platform/upstream/at-spi2-core.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1c6988d..0d7313f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [2.25.2], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.26.1], [accessibility-atspi@lists.linux-foundation.org])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -64,6 +64,17 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.28])
 AC_SUBST(GIO_LIBS)
 AC_SUBST(GIO_CFLAGS)
 
+PKG_CHECK_MODULES(APPSVC, [appsvc])
+AC_SUBST(APPSVC_LIBS)
+AC_SUBST(APPSVC_CFLAGS)
+
+PKG_CHECK_MODULES(VCONF, [vconf])
+AC_SUBST(VCONF_LIBS)
+AC_SUBST(VCONF_CFLAGS)
+
+PKG_CHECK_MODULES(AUL, [aul])
+AC_SUBST(AUL_LIBS)
+AC_SUBST(AUL_CFLAGS)
 # --------------------------------------------------------------------
 # Find DL functionality
 
@@ -107,11 +118,9 @@ AS_IF([test "x$enable_x11" = xno], [
     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])
-      X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS"
-      X11_LIBS="$X11_LIBS $XKB_LIBS"
-    ], [])
+    ], [:])
   ])
 
   AC_SUBST(X11_CFLAGS)