浏览代码

egl: Fix detection in configure script on systems without X11 (bug #5270)

In recent versions of EGL headers on Linux, the MESA_EGL_NO_X11_HEADERS macro is
deprecated and has been replaced with EGL_NO_X11. As a result, the configure
script would fail the compilation check for EGL headers and disable EGL (and by
extension, Wayland) support when X11 headers are not installed. Fix this by
adding the correct macro to disable X11 support in the headers.
Brian Kubisiak 4 年之前
父节点
当前提交
1ed36d21b0
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      configure
  2. 1 0
      configure.ac

+ 1 - 0
configure

@@ -22307,6 +22307,7 @@ $as_echo_n "checking for EGL support... " >&6; }
           #define LINUX
           #define EGL_API_FB
           #define MESA_EGL_NO_X11_HEADERS
+          #define EGL_NO_X11
           #include <EGL/egl.h>
           #include <EGL/eglext.h>
 

+ 1 - 0
configure.ac

@@ -2374,6 +2374,7 @@ CheckOpenGLESX11()
           #define LINUX
           #define EGL_API_FB
           #define MESA_EGL_NO_X11_HEADERS
+          #define EGL_NO_X11
           #include <EGL/egl.h>
           #include <EGL/eglext.h>
         ],[