Merge tag 'upstream/2.34.0' into tizen

[platform/upstream/at-spi2-core.git] / meson.build

diff --git a/meson.build b/meson.build
index 777f821..8fed991 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,12 @@
 project('at-spi2-core', 'c',
-        version: '2.31.1',
+        version: '2.34.0',
         license: 'LGPLv2.1+',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1',
           'c_std=c99',
         ],
-        meson_version: '>= 0.40.1')
+        meson_version: '>= 0.50.0')
 
 add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE' ], language: 'c')
 
@@ -55,10 +55,16 @@ 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)
 app_svc_dep = dependency('appsvc', version: app_svc_req_version)
-dl_dep = cc.find_library('dl', required: false)
+if cc.has_function('dlopen')
+  dl_dep = []
+elif cc.has_function('dlopen', args: '-ldl')
+  dl_dep = cc.find_library('dl')
+else
+  error('Could not find a library with the dlopen function')
+endif
 
 x11_deps = []
-x11_option = get_option('enable-x11')
+x11_option = get_option('x11')
 if x11_option != 'no'
   x11_dep = dependency('x11', required: false)
 
@@ -99,7 +105,7 @@ at_spi_conf.set('ALIGNOF_DBIND_STRUCT', cc.alignment('dbind_struct', prefix: 'ty
 # introspection support
 have_gir = false
 
-introspection_option = get_option('enable-introspection')
+introspection_option = get_option('introspection')
 if introspection_option != 'no'
   gir_dep = dependency('gobject-introspection-1.0', version: '>= 0.6.7', required: false)
 
@@ -120,7 +126,7 @@ subdir('bus')
 subdir('registryd')
 subdir('test')
 
-if get_option('enable_docs')
+if get_option('docs')
   subdir('doc/libatspi')
 endif