From f0943ff4317758286fd59c0e0955fe37d11e5ece Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Wed, 26 Feb 2020 10:32:58 +0100 Subject: [PATCH] prefer system installation of inih Closes #195. Signed-off-by: Stephan Lachnit --- daemon/gamemode-config.c | 2 +- meson.build | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/daemon/gamemode-config.c b/daemon/gamemode-config.c index 324e71b..d38da46 100644 --- a/daemon/gamemode-config.c +++ b/daemon/gamemode-config.c @@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "common-logging.h" /* Ben Hoyt's inih library */ -#include "ini.h" +#include #include #include diff --git a/meson.build b/meson.build index 29ef68a..e714e0c 100644 --- a/meson.build +++ b/meson.build @@ -157,8 +157,10 @@ endif # main library if with_daemon == true # inih currently only needed by the daemon - inih = subproject('inih') - inih_dependency = inih.get_variable('inih_dependency') + inih_dependency = dependency( + 'inih', + fallback : ['inih', 'inih_dependency'] + ) subdir('daemon')