From 06ceeb06cda59729275957dd1477f0c3c6389a96 Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Thu, 21 Sep 2023 15:41:46 +0200 Subject: [PATCH] Fix meson warnings Signed-off-by: Zoltan Fridrich --- bash-completion/meson.build | 2 +- doc/manual/meson.build | 2 +- meson.build | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bash-completion/meson.build b/bash-completion/meson.build index 818f7b01c..99c5203a5 100644 --- 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 index 560df8dbc..4bc8fc756 100644 --- 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 index cc606386b..090b11e2c 100644 --- 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.51') version_arr = meson.project_version().split('.') major_version = version_arr[0].to_int() @@ -62,7 +62,7 @@ conf.set10('WITH_STRICT', get_option('strict')) libintl_deps = [] if get_option('nls') and cc.has_header('libintl.h') conf.set('ENABLE_NLS', 1) - libintl = dependency('intl', required: false) + libintl = cc.find_library('intl', required: false) if libintl.found() if cc.has_function('dgettext', dependencies : libintl) libintl_deps += [libintl] @@ -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