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 7ccf4819079968f806fe5263d6105a3a4f655bac..07a97f72490a38324c6305011e8561e6fc353eb7 100644 (file)
--- 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'