drm: Branch 'master'

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c70bd7b7059b2df0d73b5dfbad19f841957bcdba
Author: Scott Anderson <[email protected]>
Date:   Tue Dec 17 22:08:02 2019 +1300

    meson: Replace 'config.h' with config_file
    
    This fixes an issue with libdrm failing to build when used as a meson
    subproject. Using 'config.h' directly will cause it to possibly refer to
    the wrong file.
    
    By using `@[email protected](config_file)`, it will be transformed into the
    correct relative path, e.g. `./config.h` in normal build,
    `./subprojects/libdrm/config.h` in subproject build.
    
    Signed-off-by: Scott Anderson <[email protected]>
    Acked-by: Eric Engestrom <[email protected]>

diff --git a/meson.build b/meson.build
index 96ee50c5..782b1a39 100644
--- a/meson.build
+++ b/meson.build
@@ -285,7 +285,7 @@ config_file = configure_file(
   configuration : config,
   output : 'config.h',
 )
-add_project_arguments('-include', 'config.h', language : 'c')
+add_project_arguments('-include', '@0@'.format(config_file), language : 'c')
 
 inc_root = include_directories('.')
 inc_drm = include_directories('include/drm')


--