From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 23 Feb 2018 19:32:03 +0000 (+0000)
Subject: meson: require shared glapi when using DRI based libGL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63b95fb291d7978e300c496cedc0851261101332;p=mesa.git

meson: require shared glapi when using DRI based libGL

Just like we do in the autotools build.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/meson.build b/meson.build
index d4f460e0b6e..4aafba802a5 100644
--- a/meson.build
+++ b/meson.build
@@ -357,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