1*4882a593SmuzhiyunUpstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606] 2*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@intel.com> 3*4882a593Smuzhiyun 4*4882a593SmuzhiyunFrom c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 5*4882a593SmuzhiyunFrom: Ross Burton <ross.burton@intel.com> 6*4882a593SmuzhiyunDate: Thu, 29 Nov 2012 11:00:43 +0000 7*4882a593SmuzhiyunSubject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunAutomatically enabling or disabling a feature based on installed files isn't 10*4882a593Smuzhiyundeterministic, and AC_CHECK_FILE returns an error when cross-compiling. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunFix this by enabling DRI by default, and removing the explicit file checks as 13*4882a593Smuzhiyunpkg-config is good enough. 14*4882a593Smuzhiyun 15*4882a593Smuzhiyun(#57606) 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@intel.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun configure.ac | 25 ++----------------------- 20*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 23 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 23*4882a593Smuzhiyunindex fca1a9c..d2aa2ed 100644 24*4882a593Smuzhiyun--- a/configure.ac 25*4882a593Smuzhiyun+++ b/configure.ac 26*4882a593Smuzhiyun@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, 27*4882a593Smuzhiyun [moduledir="$libdir/xorg/modules"]) 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], 30*4882a593Smuzhiyun- [Disable DRI support [[default=auto]]]), 31*4882a593Smuzhiyun+ [Disable DRI support [[default=enabled]]]), 32*4882a593Smuzhiyun [DRI="$enableval"], 33*4882a593Smuzhiyun- [DRI=auto]) 34*4882a593Smuzhiyun+ [DRI=yes]) 35*4882a593Smuzhiyun AC_ARG_ENABLE(exa, 36*4882a593Smuzhiyun AS_HELP_STRING([--disable-exa], 37*4882a593Smuzhiyun [Disable EXA support [[default=enabled]]]), 38*4882a593Smuzhiyun@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun # Checks for libraries. 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun-if test "x$DRI" != xno; then 43*4882a593Smuzhiyun- AC_CHECK_FILE([${sdkdir}/dri.h], 44*4882a593Smuzhiyun- [have_dri_h="yes"], [have_dri_h="no"]) 45*4882a593Smuzhiyun- AC_CHECK_FILE([${sdkdir}/sarea.h], 46*4882a593Smuzhiyun- [have_sarea_h="yes"], [have_sarea_h="no"]) 47*4882a593Smuzhiyun- AC_CHECK_FILE([${sdkdir}/dristruct.h], 48*4882a593Smuzhiyun- [have_dristruct_h="yes"], [have_dristruct_h="no"]) 49*4882a593Smuzhiyun-fi 50*4882a593Smuzhiyun- 51*4882a593Smuzhiyun-AC_MSG_CHECKING([whether to include DRI support]) 52*4882a593Smuzhiyun-if test "x$DRI" = xauto; then 53*4882a593Smuzhiyun- if test "x$have_dri_h" = xyes && \ 54*4882a593Smuzhiyun- test "x$have_sarea_h" = xyes && \ 55*4882a593Smuzhiyun- test "x$have_dristruct_h" = xyes; then 56*4882a593Smuzhiyun- DRI="yes" 57*4882a593Smuzhiyun- else 58*4882a593Smuzhiyun- DRI="no" 59*4882a593Smuzhiyun- fi 60*4882a593Smuzhiyun-fi 61*4882a593Smuzhiyun-AC_MSG_RESULT([$DRI]) 62*4882a593Smuzhiyun- 63*4882a593Smuzhiyun AM_CONDITIONAL(DRI, test "x$DRI" = xyes) 64*4882a593Smuzhiyun if test "x$DRI" = xyes; then 65*4882a593Smuzhiyun PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) 66*4882a593Smuzhiyun-- 67*4882a593Smuzhiyun1.7.10.4 68*4882a593Smuzhiyun 69