Skip to content

Commit

Permalink
Fix meson warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Zoltan Fridrich <[email protected]>
  • Loading branch information
ZoltanFridrich committed Oct 3, 2023
1 parent 231878d commit 06ceeb0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bash-completion/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
Expand Down
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 06ceeb0

Please sign in to comment.