From 8d3b1210cb2bb590c9af880dab087f27c64b88c3 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 18 Oct 2017 15:47:11 -0700 Subject: [PATCH] meson: Don't allow glx to be built without platform_x11 Previously this failed to change with_glx to disabled from auto if platform_x11 was unset or if no opengl apis were being built. v2: - swap conditional positions Signed-off-by: Dylan Baker Reviewed-and-Tested-by: Eric Engestrom --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6b11a5d3103..a8bcaf7621b 100644 --- a/meson.build +++ b/meson.build @@ -157,8 +157,12 @@ endif pre_args += '-DGLX_USE_TLS' with_glx = get_option('glx') if with_glx != 'disabled' - if not (with_platform_x11 and with_any_opengl) and with_glx != 'auto' - error('Cannot build GLX support without X11 platform support and at least one OpenGL API') + if not (with_platform_x11 and with_any_opengl) + if with_glx == 'auto' + with_glx = 'disabled' + else + error('Cannot build GLX support without X11 platform support and at least one OpenGL API') + endif elif with_glx == 'gallium-xlib' if not with_gallium error('Gallium-xlib based GLX requires at least one gallium driver') -- 2.30.2