Mesa (master): meson: Set with_dri from with_gallium when DRI glx is explicitly configured

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ab7aa0f10cad31c79fc2ae519733564e1557478a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab7aa0f10cad31c79fc2ae519733564e1557478a

Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Jan 15 19:39:46 2018 +0000

meson: Set with_dri from with_gallium when DRI glx is explicitly configured

Set with_dri from with_gallium when DRI GLX is explicitly configured, as
well as when DRI GLX is chosen automatically.

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index b2722c71e5..7d12af3d51 100644
--- a/meson.build
+++ b/meson.build
@@ -263,7 +263,6 @@ if with_glx == 'auto'
   elif with_gallium
     # Even when building just gallium drivers the user probably wants dri
     with_glx = 'dri'
-    with_dri = true
   elif with_platform_x11 and with_any_opengl and not with_any_vk
     # The automatic behavior should not be to turn on xlib based glx when
     # building only vulkan drivers
@@ -272,6 +271,11 @@ if with_glx == 'auto'
     with_glx = 'disabled'
   endif
 endif
+if with_glx == 'dri'
+   if with_gallium
+      with_dri = true
+   endif
+endif
 
 if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
   with_gles1 = false