Fix meson warnings

Signed-off-by: Zoltan Fridrich <[email protected]>
p11-glue · Sep 21, 2023 · 01cd3f4 · 01cd3f4
1 parent 231878d
commit 01cd3f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/bash-completion/meson.build b/bash-completion/meson.build
@@ -2,7 +2,7 @@ bashcompdir = get_option('bashcompdir')
 if bashcompdir == ''
   bashcomp = dependency('bash-completion', required: get_option('bash_completion'))
   if bashcomp.found()
-    bashcompdir = bashcomp.get_pkgconfig_variable('completionsdir')
+    bashcompdir = bashcomp.get_variable(pkgconfig : 'completionsdir')
   else
     warning('Will not install bash completion due to missing dependencies!')
   endif

diff --git a/doc/manual/meson.build b/doc/manual/meson.build
@@ -62,7 +62,7 @@ if get_option('gtk_doc')
 
   glib_prefix = get_option('glib_prefix')
   if glib_prefix == ''
-    glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+    glib_prefix = dependency('glib-2.0').get_variable(pkgconfig : 'prefix')
   endif
   fixxref_args = [
     '--html-dir=' + (prefix / gnome.gtkdoc_html_dir(meson.project_name())),

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('p11-kit', 'c',
         version: '0.25.0',
-        meson_version: '>= 0.49')
+        meson_version: '>= 0.59')
 
 version_arr = meson.project_version().split('.')
 major_version = version_arr[0].to_int()
@@ -422,7 +422,7 @@ libsystemd_deps = []
 libsystemd = dependency('libsystemd', required: get_option('systemd'))
 systemd = dependency('systemd', required: get_option('systemd'))
 if libsystemd.found() and systemd.found()
-  systemduserunitdir = systemd.get_pkgconfig_variable('systemduserunitdir')
+  systemduserunitdir = systemd.get_variable(pkgconfig : 'systemduserunitdir')
   conf.set('WITH_SYSTEMD', 1)
   libsystemd_deps += libsystemd
   with_systemd = true