summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-09-25 17:38:49 +0100
committerEric Engestrom <eric.engestrom@intel.com>2019-10-31 17:09:59 +0000
commit6e21dcc5a31634232660eff1a83052c2ebb4816c (patch)
tree0061d60279b43c9ed33929e31e115aef789e0093 /meson.build
parent0f201e9dbc8711f61a692de50cf283a30fad3030 (diff)
meson: revert glvnd workaround
This effectively reverts MR !2112. Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build4
1 files changed, 0 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 9871d9d6aa9..b2d160ccedf 100644
--- a/meson.build
+++ b/meson.build
@@ -1447,12 +1447,8 @@ else
endif
dep_glvnd = null_dep
-glvnd_has_headers_and_pc_files = false
if with_glvnd
dep_glvnd = dependency('libglvnd', version : '>= 1.2.0')
- # GLVND before 1.2 was missing its pkg-config and header files, forcing every
- # vendor to provide them and the distro maintainers to resolve the conflict.
- glvnd_has_headers_and_pc_files = dep_glvnd.version().version_compare('>= 1.2.0')
pre_args += '-DUSE_LIBGLVND=1'
endif