xserver: Branch 'master'

[Adam Jackson]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4cc32880737c2d3e568fdb4867b2dba10fb3998a
Author: Alexandre Courbot <acourbot at nvidia.com>
Date:   Wed Mar 23 13:47:37 2016 +0900

    configure.ac: Keep environment CFLAGS when testing
    
    DRI2 detection could fail if configure is invoked with a sysroot passed
    as CFLAGS. Ideally configure should invoke gcc with the sysroot argument
    passed to the configure script, but for some reason this is not done by
    AC_COMPILE_IFELSE.
    
    Fix this by ensuring CFLAGS are preserved when checking for stuff.
    
    Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/configure.ac b/configure.ac
index 06b6a08..db87ff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -880,7 +880,7 @@ if test "x$CONFIG_UDEV" = xyes; then
 	fi
 	SAVE_LIBS=$LIBS
 	SAVE_CFLAGS=$CFLAGS
-	CFLAGS=$UDEV_CFLAGS
+	CFLAGS="$CFLAGS $UDEV_CFLAGS"
 	LIBS=$UDEV_LIBS
 	AC_CHECK_FUNCS([udev_monitor_filter_add_match_tag])
 	AC_CHECK_FUNCS([udev_enumerate_add_match_tag])
@@ -1293,7 +1293,7 @@ fi
 
 if test "x$DRI2" = xyes; then
 	save_CFLAGS=$CFLAGS
-	CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"
+	CFLAGS="$CFLAGS $GL_CFLAGS $LIBDRM_CFLAGS"
 	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
 #ifndef __DRI_DRI2