From 9dea9f5a3801d612f78c738fe7efccefa5745000 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 3 Feb 2023 17:16:10 -0500 Subject: [PATCH] Fix includes for glx check Having the wrong headers causes an implicit declaration warning, which will be an error in the future. Related to: --- m4/ax_check_gl.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 index e08e9c57..bc537d06 100644 --- a/m4/ax_check_gl.m4 +++ b/m4/ax_check_gl.m4 @@ -56,7 +56,7 @@ AC_CHECK_HEADERS([windows.h]) ax_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$GL_CFLAGS $CPPFLAGS" -AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], , , [ +AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h GL/glx.h OpenGL/glx.h], , , [ # if defined(HAVE_WINDOWS_H) && defined(_WIN32) # include # endif @@ -82,12 +82,12 @@ m4_define([AX_CHECK_GL_GLX_PROGRAM], # if defined(HAVE_WINDOWS_H) && defined(_WIN32) # include # endif -# ifdef HAVE_GL_GL_H -# include -# elif defined(HAVE_OPENGL_GL_H) -# include +# ifdef HAVE_GL_GLX_H +# include +# elif defined(HAVE_OPENGL_GLX_H) +# include # else -# error no gl.h +# error no glx.h # endif]], [[glXQueryVersion(0, 0, 0)]])]) -- 2.11.4.GIT