X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=4aafba802a5e4d842825199a8769560b2b09abe8;hb=1945231b48df8ffcfa2eb168f81c3f5984433b01;hp=d0cb896163814873eb5f1f0379bdf92adc80c78b;hpb=f9eb1ef870eba9fdacf9a8cbd815ec3bff81db05;p=mesa.git

diff --git a/meson.build b/meson.build
index d0cb8961638..4aafba802a5 100644
--- a/meson.build
+++ b/meson.build
@@ -344,11 +344,7 @@ endif
 pre_args += '-DGLX_USE_TLS'
 if with_glx != 'disabled'
   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
+    error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
   elif with_glx == 'gallium-xlib' 
     if not with_gallium
       error('Gallium-xlib based GLX requires at least one gallium driver')
@@ -361,8 +357,12 @@ if with_glx != 'disabled'
     if with_dri
       error('xlib conflicts with any dri driver')
     endif
-  elif with_glx == 'dri' and not with_dri
-    error('dri based GLX requires at least one DRI driver')
+  elif with_glx == 'dri'
+    if not with_dri
+      error('dri based GLX requires at least one DRI driver')
+    elif not with_shared_glapi
+      error('dri based GLX requires shared-glapi')
+    endif
   endif
 endif