diff options
| author | Eric Engestrom <[email protected]> | 2019-09-30 10:26:43 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-10-10 22:18:04 +0100 |
| commit | b57fa7ca49f7ddb67ac47f392de05af388e73565 (patch) | |
| tree | 911dd098afaeeede5b7c0dfa958268a1e8ae6380 /src | |
| parent | a0829cf23b307ca44ab8c4505974fb7c8d71a35a (diff) | |
meson: rename `glvnd_missing_pc_files` to `not glvnd_has_headers_and_pc_files`
This reflects better what is provided by glvnd or not.
Fixes: 93df862b6affb6b8507e ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/meson.build | 4 | ||||
| -rw-r--r-- | src/meson.build | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build index 7d738e2ebd1..9c2c055c3eb 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -176,8 +176,8 @@ libegl = shared_library( # If using glvnd the pkg-config header should not point to EGL_mesa, it should # point to EGL. glvnd is only available on unix like platforms so adding -l # should be safe here -if not with_glvnd or glvnd_missing_pc_files - if glvnd_missing_pc_files +if not with_glvnd or not glvnd_has_headers_and_pc_files + if not glvnd_has_headers_and_pc_files _egl = '-L${libdir} -lEGL' else _egl = libegl diff --git a/src/meson.build b/src/meson.build index 10b2772f907..15fa52be57c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -112,12 +112,12 @@ 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' and (not with_glvnd or glvnd_missing_pc_files) +if with_glx != 'disabled' and (not with_glvnd or not glvnd_has_headers_and_pc_files) # 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 glvnd_missing_pc_files + if not glvnd_has_headers_and_pc_files _gl = '-L${libdir} -lGL' else _gl = libgl |