Automatically enabling or disabling a feature based on installed files isn't deterministic, and AC_CHECK_FILE returns an error when cross-compiling.
Fix this by enabling DRI by default, and removing the explicit file checks as pkg-config is good enough. (#57606) Signed-off-by: Ross Burton <[email protected]> --- configure.ac | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index fca1a9c..f073ad9 100644 --- a/configure.ac +++ b/configure.ac @@ -55,9 +55,10 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$libdir/xorg/modules"]) AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], - [Disable DRI support [[default=auto]]]), + [Disable DRI support [[default=enabled]]]), [DRI="$enableval"], - [DRI=auto]) + [PKG_CHECK_EXISTS([libdrm >= 2.0 xf86driproto], DRI=yes, DRI=no)]) + AC_ARG_ENABLE(exa, AS_HELP_STRING([--disable-exa], [Disable EXA support [[default=enabled]]]), @@ -76,27 +77,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` # Checks for libraries. -if test "x$DRI" != xno; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -fi - -AC_MSG_CHECKING([whether to include DRI support]) -if test "x$DRI" = xauto; then - if test "x$have_dri_h" = xyes && \ - test "x$have_sarea_h" = xyes && \ - test "x$have_dristruct_h" = xyes; then - DRI="yes" - else - DRI="no" - fi -fi -AC_MSG_RESULT([$DRI]) - AM_CONDITIONAL(DRI, test "x$DRI" = xyes) if test "x$DRI" = xyes; then PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) -- 1.7.10.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
