frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@nvidia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Alexandre Courbot 2016-03-23 13:47:37 +09:00 committed by Adam Jackson
parent 16e4bce9e5
commit 4cc3288073
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

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