From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 15 Nov 2017 01:04:27 +0000 (-0800)
Subject: meson: Guard the gallium dri componenet
X-Git-Tag: upstream/18.1.0~3864
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8417c8d25e57b00e7202908d93e56daf54513af;p=platform%2Fupstream%2Fmesa.git

meson: Guard the gallium dri componenet

Currently the target has a redundant guard, and the state tracker isn't
properly guarded.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 7ccf481..07a97f7 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -73,7 +73,9 @@ endif
 if with_glx == 'gallium-xlib'
   subdir('winsys/sw/xlib')
 endif
-subdir('state_trackers/dri')
+if with_dri
+  subdir('state_trackers/dri')
+endif
 if with_osmesa == 'gallium'
   subdir('state_trackers/osmesa')
 endif
@@ -87,7 +89,7 @@ endif
 # TODO: SWR
 # TODO: virgl
 # TODO: clover
-if with_dri and with_gallium
+if with_dri
   subdir('targets/dri')
 endif
 if with_osmesa == 'gallium'