[PATCH xserver 1/2] meson: Fix test for whether we've built glamor-EGL.

Eric Anholt eric at anholt.net
Thu Jun 1 19:29:11 UTC 2017


This matches the test we use for going into the glamor_egl subdir in
../../meson.build.
---
 hw/xfree86/drivers/modesetting/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/drivers/modesetting/meson.build b/hw/xfree86/drivers/modesetting/meson.build
index ab3227605bb2..c1546f62d783 100644
--- a/hw/xfree86/drivers/modesetting/meson.build
+++ b/hw/xfree86/drivers/modesetting/meson.build
@@ -31,7 +31,7 @@ symbol_test_args = []
 symbol_test_args += join_paths(xorg_build_root, 'libxorgserver.so')
 symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libfb.so')
 symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
-if build_glamor
+if gbm_dep.found()
     symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so')
 endif
 symbol_test_args += join_paths(xorg_build_root, 'drivers', 'modesetting', 'modesetting_drv.so')
-- 
2.11.0



More information about the xorg-devel mailing list