Mesa (master): meson: Don't allow glx to be built without platform_x11

[Dylan Baker]

Module: Mesa
Branch: master
Commit: 8d3b1210cb2bb590c9af880dab087f27c64b88c3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d3b1210cb2bb590c9af880dab087f27c64b88c3

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Wed Oct 18 15:47:11 2017 -0700

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 at intel.com>
Reviewed-and-Tested-by: Eric Engestrom <eric at engestrom.ch>

---

 meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 6b11a5d310..a8bcaf7621 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')