meson.build: Fallback from libGL to libOpenGL when GLX is disabled

anholt · Aug 30, 2021 · 702a0e6 · 702a0e6
1 parent 71dcab0
commit 702a0e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/meson.build b/meson.build
@@ -164,6 +164,9 @@ endif
 # Dependencies
 dl_dep = cc.find_library('dl', required: false)
 gl_dep = dependency('gl', required: false)
+if not gl_dep.found() and not build_glx
+	gl_dep = dependency('opengl', required: false)
+endif
 egl_dep = dependency('egl', required: false)
 
 # Optional dependencies for tests

diff --git a/src/meson.build b/src/meson.build
@@ -93,7 +93,7 @@ libepoxy_dep = declare_dependency(
 # pkg-config file, for consumers of Epoxy
 gl_reqs = []
 if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
-  gl_reqs += 'gl'
+  gl_reqs += gl_dep.name()
 endif
 if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
   gl_reqs += 'egl'