From 9e6b3e36dd69cf375e4a61a413e83877c092289e Mon Sep 17 00:00:00 2001 From: Jason Macnak Date: Fri, 27 Dec 2019 21:31:53 -0800 Subject: [PATCH] meson: include epoxy dep when looking for epoxy headers Updates meson.build so that epoxy headers are found when they are in a non standard location specified via pkg config. Reviewed-by: Gurchetan Singh --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6e7f41a..4333a0d 100644 --- a/meson.build +++ b/meson.build @@ -127,7 +127,7 @@ else endif if with_egl - if cc.has_header('epoxy/egl.h') and epoxy_dep.get_pkgconfig_variable('epoxy_has_egl') == '1' + if cc.has_header('epoxy/egl.h', dependencies: epoxy_dep) and epoxy_dep.get_pkgconfig_variable('epoxy_has_egl') == '1' gbm_dep = dependency('gbm', version: '>= ' + _gbm_ver, required: require_egl) have_egl = gbm_dep.found() conf_data.set('HAVE_EPOXY_EGL_H', 1) @@ -138,7 +138,7 @@ if with_egl endif if with_glx - if cc.has_header('epoxy/glx.h') and epoxy_dep.get_pkgconfig_variable('epoxy_has_glx') == '1' + if cc.has_header('epoxy/glx.h', dependencies: epoxy_dep) and epoxy_dep.get_pkgconfig_variable('epoxy_has_glx') == '1' glx_dep = dependency('x11', required: require_glx) have_glx = glx_dep.found() conf_data.set('HAVE_EPOXY_GLX_H', 1)