From 6ea324ffb176b83a72981d9c123920cd9271356c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 18 Feb 2014 00:57:24 +0000 Subject: [PATCH] configure: use default dri drivers whenever opengl and dri are enabled Commit ee55500c22a(configure: cleanup classic dri drivers handling) cleaned up the logic handling autodetection of dri drivers, but missed the case when one can explicitly disable dri, and still request opengl. Fixes build issues for the following ./autogen.sh --disable-dri --with-gallium-drivers=swrast While we're here, explicitly clear with_dri_drivers whenever building without such drivers to prevent choking later on. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75126 Signed-off-by: Emil Velikov --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fc5e028..0c45f63 100644 --- a/configure.ac +++ b/configure.ac @@ -951,11 +951,15 @@ AC_ARG_WITH([dri-drivers], [with_dri_drivers=auto]) case "$with_dri_drivers" in -no) ;; +no) + with_dri_drivers="" + ;; auto) # classic DRI drivers - if test "x$enable_opengl" = xyes; then + if test "x$enable_opengl" = xyes -a "x$enable_dri" = xyes; then with_dri_drivers="yes" + else + with_dri_drivers="" fi ;; esac -- 1.9.0