X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=meson.build;h=0cfdbef0763c3cf8031991f939bf3c0599fd9997;hb=086463c9ae17f591f4fe09e08e870c646506a006;hp=72f9b8794abd0868290d90543ba1ea019ac20237;hpb=774a363203dfaa6212295c9da29feba64dc29823;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/meson.build b/meson.build
index 72f9b87..0cfdbef 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('at-spi2-core', 'c',
-        version: '2.25.92',
+        version: '2.26.1',
         license: 'LGPLv2.1+',
         default_options: [
           'buildtype=debugoptimized',
@@ -53,23 +53,25 @@ glib_dep = dependency('glib-2.0', version: glib_req_version)
 gobject_dep = dependency('gobject-2.0', version: gobject_req_version)
 gio_dep = dependency('gio-2.0', version: gio_req_version)
 dl_dep = cc.find_library('dl', required: false)
-x11_dep = dependency('x11', required: false)
 
 x11_deps = []
-if x11_dep.found()
-  x11_deps += x11_dep
-
-  xtest_dep = dependency('xtst')
-  x11_deps += xtest_dep
-
-  xkb_dep = dependency('xkbcommon-x11', required: false)
-  if xkb_dep.found()
-    x11_deps += xkb_dep
-    at_spi_conf.set('HAVE_XKB', 1)
+x11_option = get_option('enable-x11')
+if x11_option != 'no'
+  x11_dep = dependency('x11', required: false)
+
+  if x11_dep.found()
+    x11_deps += x11_dep
+    at_spi_conf.set('HAVE_X11', 1)
+    xtest_dep = dependency('xtst')
+    x11_deps += xtest_dep
+
+    if cc.has_function('XkbGetMap', dependencies: x11_deps)
+      at_spi_conf.set('HAVE_XKB', 1)
+    endif
+
+    xinput_dep = dependency('xi')
+    x11_deps += xinput_dep
   endif
-
-  xinput_dep = dependency('xi')
-  x11_deps += xinput_dep
 endif
 
 # Alignments