From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 19 Dec 2019 02:11:18 +0000 (+0000)
Subject: meson: move xlib-lease block further down
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60ad006b27e1e577e29636e56178523893051968;p=mesa.git

meson: move xlib-lease block further down

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3161>
---

diff --git a/meson.build b/meson.build
index 1c4e93d5207..c9b4e366ea3 100644
--- a/meson.build
+++ b/meson.build
@@ -323,20 +323,6 @@ else
   egl_native_platform = 'surfaceless'
 endif
 
-_xlib_lease = get_option('xlib-lease')
-if _xlib_lease == 'true'
-  _xlib_lease = 'enabled'
-  warning('xlib_lease option "true" deprecated, please use "enabled" instead.')
-elif _xlib_lease == 'false'
-  _xlib_lease = 'disabled'
-  warning('xlib_lease option "false" deprecated, please use "disabled" instead.')
-endif
-if _xlib_lease == 'auto'
-  with_xlib_lease = with_platform_x11 and with_platform_drm
-else
-  with_xlib_lease = _xlib_lease == 'enabled'
-endif
-
 with_glx = get_option('glx')
 if with_glx == 'auto'
   if with_dri
@@ -387,6 +373,20 @@ if with_gbm and not system_has_kms_drm
   error('GBM only supports DRM/KMS platforms')
 endif
 
+_xlib_lease = get_option('xlib-lease')
+if _xlib_lease == 'true'
+  _xlib_lease = 'enabled'
+  warning('xlib_lease option "true" deprecated, please use "enabled" instead.')
+elif _xlib_lease == 'false'
+  _xlib_lease = 'disabled'
+  warning('xlib_lease option "false" deprecated, please use "disabled" instead.')
+endif
+if _xlib_lease == 'auto'
+  with_xlib_lease = with_platform_x11 and with_platform_drm
+else
+  with_xlib_lease = _xlib_lease == 'enabled'
+endif
+
 _egl = get_option('egl')
 if _egl == 'true'
   _egl = 'enabled'