meson: Allow building glvnd with EGL and non-dri based GLX
Because meson mirrors the auototools logic, it needs the same changes to
allow building glvnd based egl.
v2: - change if to elif (Eric)
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
diff --git a/meson.build b/meson.build
index 44e062e..cd70651 100644
--- a/meson.build
+++ b/meson.build
@@ -231,8 +231,12 @@
endif
with_glvnd = get_option('glvnd')
-if with_glvnd and with_glx != 'dri'
- message('glvnd requires dri based glx')
+if with_glvnd
+ if with_glx == 'xlib' or with_glx == 'gallium-xlib'
+ error('Cannot build glvnd support for GLX that is not DRI based.')
+ elif with_glx == 'disabled' and not with_egl
+ error('glvnd requires DRI based GLX and/or EGL')
+ endif
endif
# TODO: toggle for this