From c8417c8d25e57b00e7202908d93e56daf54513af Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 14 Nov 2017 17:04:27 -0800 Subject: [PATCH] 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 Reviewed-by: Eric Anholt --- src/gallium/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 7ccf4819079..07a97f72490 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' -- 2.30.2