diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-10-18 15:47:11 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-10-20 16:46:48 -0700 |
| commit | 8d3b1210cb2bb590c9af880dab087f27c64b88c3 (patch) | |
| tree | 614b22c0626e2c3ceb80b47d663c0b22b212a11e | |
| parent | 8792a9e01b6e41584223c1898644f7d25e2cab2d (diff) | |
| download | mesa-8d3b1210cb2bb590c9af880dab087f27c64b88c3.tar.gz | |
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 <dylanx.c.baker@intel.com>
Reviewed-and-Tested-by: Eric Engestrom <eric@engestrom.ch>
| -rw-r--r-- | meson.build | 8 |
1 files 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') |