From 3adde9ea4015de7d38490134f37c2ba07bc4133c Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 28 Nov 2017 17:52:12 +0530
Subject: meson: Fix including of config.h

We must use include_directories: to pass that so that it's not overriden
by include paths from internal dependencies which will very commonly
also have their own config.h in one of their include paths.
---
 giscanner/meson.build | 2 ++
 meson.build           | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/giscanner/meson.build b/giscanner/meson.build
index dc166f5a..006722d2 100644
--- a/giscanner/meson.build
+++ b/giscanner/meson.build
@@ -69,12 +69,14 @@ giscanner_lib = static_library('giscanner',
     scannerlexer,
   ],
   c_args: giscanner_args,
+  include_directories : configinc,
   dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
 )
 
 giscanner_pymod = py3.extension_module('_giscanner', 'giscannermodule.c',
   link_with: giscanner_lib,
   c_args: [gi_hidden_visibility_cflags],
+  include_directories : configinc,
   dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep,
                  dependency('python3')],
   install: true,
diff --git a/meson.build b/meson.build
index 95375c83..acb4c8e9 100644
--- a/meson.build
+++ b/meson.build
@@ -29,11 +29,7 @@ foreach type : ['char', 'short', 'int', 'long']
   config.set('SIZEOF_@0@'.format(type.to_upper()), size)
 endforeach
 
-add_project_arguments([
-    '-I' + meson.build_root(),
-    '-DHAVE_CONFIG_H',
-  ], language: 'c',
-)
+add_project_arguments(['-DHAVE_CONFIG_H'], language: 'c')
 
 gi_hidden_visibility_cflags = []
 if host_machine.system() == 'windows'
-- 
cgit v1.2.1