meson: fix building without GL
authorDylan Baker <dylan@pnwbakers.com>
Mon, 26 Feb 2018 16:43:54 +0000 (08:43 -0800)
committerDylan Baker <dylan@pnwbakers.com>
Mon, 26 Feb 2018 17:32:14 +0000 (09:32 -0800)
commitb9636fe38aea6af1d3a30528da89069fc390b6a0
treed0082d0e4cbf8a2b8d9d436ce4cb0e14059b0181
parentfca9f5b5851d2eeba6d030e28dd783017fef55cf
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@intel.com>
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
CC: Daniel Stone <daniels@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Untested-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/meson.build