Browse Source

prefer system installation of inih

Closes #195.

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
Stephan Lachnit 5 years ago
parent
commit
f0943ff431
2 changed files with 5 additions and 3 deletions
  1. 1 1
      daemon/gamemode-config.c
  2. 4 2
      meson.build

+ 1 - 1
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 <ini.h>
 
 #include <dirent.h>
 #include <math.h>

+ 4 - 2
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')