Skip to content

Commit

Permalink
egl: Fix detection in configure script on systems without X11 (bug #5270
Browse files Browse the repository at this point in the history
)

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.
  • Loading branch information
velentr committed Nov 15, 2020
1 parent bbbec72 commit 1ed36d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions configure
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -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>
],[
Expand Down

0 comments on commit 1ed36d2

Please sign in to comment.