X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmeson.build;h=19005271d733b968bde273f905827df30c074c96;hb=086c88551d286cf29a2414227fc3a6f4b0c9c455;hp=730b2ff6e41bfede417aaadd8b34374cbfa44628;hpb=5fcadaec80c97a1df280b7bab01c271e323a468a;p=mesa.git

diff --git a/src/meson.build b/src/meson.build
index 730b2ff6e41..19005271d73 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -64,7 +64,12 @@ if with_dri_i965 or with_intel_vk
 endif
 subdir('mesa')
 subdir('loader')
-subdir('glx')
+if with_platform_haiku
+  subdir('hgl')
+endif
+if with_glx != 'disabled'
+  subdir('glx')
+endif
 if with_gbm
   subdir('gbm')
 else
@@ -80,11 +85,21 @@ 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'
+  # 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 with_glvnd
+    _gl = '-L${libdir} -lGL'
+  else
+    _gl = libgl
+  endif
+
   pkg.generate(
     name : 'gl',
     description : 'Mesa OpenGL Library',
     version : meson.project_version(),
-    libraries : libgl,
+    libraries : _gl,
     libraries_private : gl_priv_libs,
     requires_private : gl_priv_reqs,
     variables : ['glx_tls=yes'],