From e88ee1b37a70dddded9420a1abf245167894910a Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Mon, 26 Apr 2021 10:02:53 +0200 Subject: [PATCH] build: do not install catalogs on glade-ui not found Previously, when in check mode and when the glade-ui pkgconfig file was not installed, the build system was trying to get the catalogdir variable name anyway, resulting in a hard fail. --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7ff951c6..2f10e01f 100644 --- a/meson.build +++ b/meson.build @@ -80,7 +80,9 @@ if catalogdir == 'yes' or catalogdir == 'check' if not glade_dep.found() glade_dep = dependency('gladeui-1.0', required: catalogdir == 'yes') endif - catalogdir = glade_dep.get_pkgconfig_variable('catalogdir') + if glade_dep.found() + catalogdir = glade_dep.get_variable(pkgconfig: 'catalogdir') + endif elif catalogdir == 'no' # Both 'no' and '' mean "Do not install catalogs" catalogdir = '' -- 2.11.4.GIT