drm: Branch 'master' - 2 commits

 meson.build |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit a58490de0d8ae5c290d2db6e59fc44edc829d9c6
Author: Eric Engestrom <[email protected]>
Date:   Tue Mar 13 14:31:29 2018 +0000

    meson: detect alloca.h
    
    amdgpu makes use of it
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>

diff --git a/meson.build b/meson.build
index b85f1d7a..2a6c4680 100644
--- a/meson.build
+++ b/meson.build
@@ -186,7 +186,7 @@ else
   dep_rt = []
 endif
 dep_m = cc.find_library('m', required : false)
-foreach header : ['sys/sysctl.h', 'sys/select.h']
+foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
   if cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header))
     config.set10('HAVE_' + header.underscorify().to_upper(), true)
   endif
commit 2bd461e32a5fd50169704786ba975324ddc11cb2
Author: Eric Engestrom <[email protected]>
Date:   Mon Mar 12 16:17:55 2018 +0000

    meson: make it easy to add headers to check
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>

diff --git a/meson.build b/meson.build
index a0c79e30..b85f1d7a 100644
--- a/meson.build
+++ b/meson.build
@@ -186,12 +186,11 @@ else
   dep_rt = []
 endif
 dep_m = cc.find_library('m', required : false)
-if cc.compiles('#include <sys/sysctl.h>', name : 'sys/sysctl.h works')
-  config.set10('HAVE_SYS_SYSCTL_H', true)
-endif
-if cc.compiles('#include <sys/select.h>', name : 'sys/select.h works')
-  config.set10('HAVE_SYS_SELECT_H', true)
-endif
+foreach header : ['sys/sysctl.h', 'sys/select.h']
+  if cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header))
+    config.set10('HAVE_' + header.underscorify().to_upper(), true)
+  endif
+endforeach
 if cc.has_header_symbol('sys/sysmacros.h', 'major')
   config.set10('MAJOR_IN_SYSMACROS', true)
 elif cc.has_header_symbol('sys/mkdev.h', 'major')

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--