Mesa (master): meson: fix building without GL

[Dylan Baker]

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

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Mon Feb 26 08:43:54 2018 -0800

meson: fix building without GL

libgl will be undefined _glx, so move that check inside the
`if with_glx != 'disabled'` block.

v2: - Simplify commit message (Eric, Emil)

Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd")
Reported-by: Jason Ekstrand <jason.ekstrand at intel.com>
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
CC: Daniel Stone <daniels at collabora.com>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Untested-by: Jason Ekstrand <jason at jlekstrand.net>
Acked-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/meson.build | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index b2c045fce1..19005271d7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -82,18 +82,19 @@ if with_gallium
   subdir('gallium')
 endif
 
-# If using glvnd the pkg-config header should not point to GL_mesa, it should
-# point to GL. glvnd is only available on unix like platforms so adding -l
-# should be safe here
-# TODO: in the glvnd case glvnd itself should really be providing this.
-if with_glvnd
-  _gl = '-L${libdir} -lGL'
-else
-  _gl = libgl
-endif
 # This must be after at least mesa, glx, and gallium, since libgl will be
 # defined in one of those subdirs depending on the glx provider.
 if with_glx != 'disabled'
+  # If using glvnd the pkg-config header should not point to GL_mesa, it should
+  # point to GL. glvnd is only available on unix like platforms so adding -l
+  # should be safe here
+  # TODO: in the glvnd case glvnd itself should really be providing this.
+  if with_glvnd
+    _gl = '-L${libdir} -lGL'
+  else
+    _gl = libgl
+  endif
+
   pkg.generate(
     name : 'gl',
     description : 'Mesa OpenGL Library',