diff --git a/hw/xfree86/drivers/video/modesetting/meson.build b/hw/xfree86/drivers/video/modesetting/meson.build
index 3a6abb3802..68ada3c096 100644
--- a/hw/xfree86/drivers/video/modesetting/meson.build
+++ b/hw/xfree86/drivers/video/modesetting/meson.build
@@ -34,7 +34,7 @@ symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
 if build_glx
   symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libglx.so')
 endif
-if gbm_dep.found()
+if build_glamor
     symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so')
 endif
 symbol_test_args += join_paths(xorg_build_root, 'drivers', 'video', 'modesetting', 'modesetting_drv.so')
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index f83a535460..3f3e6d3955 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -118,7 +118,7 @@ xserver_exec = executable(
 subdir('dixmods')
 subdir('exa')
 subdir('fbdevhw')
-if gbm_dep.found()
+if build_glamor and gbm_dep.found()
     subdir('glamor_egl')
 endif
 if int10 != 'false'
diff --git a/meson.build b/meson.build
index 11c2915352..3ba0aaf40c 100644
--- a/meson.build
+++ b/meson.build
@@ -365,10 +365,9 @@ else
     build_glamor = glamor_option == 'true'
 endif
 
-gbm_dep = dependency('', required: false)
+gbm_dep = dependency('gbm', version: gbm_req, required: false)
 epoxy_dep = dependency('', required: false)
 if build_glamor
-    gbm_dep = dependency('gbm', version: gbm_req, required: false)
     epoxy_dep = dependency('epoxy', required: false)
 endif
 
@@ -532,7 +531,7 @@ if not libdrm_dep.found() and libdrm_required
     error('DRI requested, but LIBDRM not found')
 endif
 
-build_modesetting = libdrm_dep.found() and dri2proto_dep.found()
+build_modesetting = libdrm_dep.found() and dri2proto_dep.found() and gbm_dep.found()
 
 build_vgahw = false
 if get_option('vgahw') == 'auto'