xserver: Branch 'master'

[GitLab Mirror]

 xorg-server.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f65a6246fe752764045dd1e38912f1dccec71e4
Author: Ross Burton <ross.burton at intel.com>
Date:   Thu Sep 20 20:12:24 2018 +0100

    xorg-server.m4: just all cflags instead of just sdkdir
    
    Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
    simply get all of the CFLAGS.  Aside from completeness, this helps builds in
    sysroots as pkg-config knows what to do with --cflags but doesn't remap
    arbitrary variables.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>

diff --git a/xorg-server.m4 b/xorg-server.m4
index 18255b91a..195bda5d8 100644
--- a/xorg-server.m4
+++ b/xorg-server.m4
@@ -31,7 +31,7 @@ dnl
 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
 	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include "xorg-server.h"
 #if !defined $1