brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl: Make sure to have egl.h included when testing for eglext.h

Browse Source 
AC_CHECK_HEADER(S) for eglext.h need include egl.h as it may not be done
for you.

The patch tries to integrate with the previous work to check if
GLES/egl.h ir EGL/egl.h should be included for egl.h.
This commit is contained in:
Damien Lespiau 2011-07-22 17:13:44 +03:00
parent 9ca3308892
commit f798e6e0c7
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -413,14 +413,16 @@ AS_IF([test "x$enable_gles1" = "xyes"],
[test "x$ac_cv_header_EGL_egl_h" = "xyes"], [test "x$ac_cv_header_EGL_egl_h" = "xyes"],
[ [
COGL_EGL_INCLUDES="#include <EGL/egl.h>" COGL_EGL_INCLUDES="#include <EGL/egl.h>"
AC_CHECK_HEADERS([EGL/eglext.h],
[COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
#include <EGL/eglext.h>"],
[])
], ],
[AC_MSG_ERROR([Unable to locate EGL header])]) [AC_MSG_ERROR([Unable to locate EGL header])])
AC_SUBST([COGL_EGL_INCLUDES]) AC_SUBST([COGL_EGL_INCLUDES])
AC_CHECK_HEADERS([EGL/eglext.h],
[COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
#include <EGL/eglext.h>"],
[],
[$COGL_EGL_INCLUDES])
# Check for a GLES 1.x Common Profile library with/without EGL. # Check for a GLES 1.x Common Profile library with/without EGL.
# #
# Note: historically GLES 1 libraries shipped with the # Note: historically GLES 1 libraries shipped with the
@ -752,9 +754,14 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
[COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"], [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"],
[ [
AC_CHECK_HEADERS( AC_CHECK_HEADERS(
[EGL/egl.h EGL/eglext.h], [EGL/egl.h],
[], [],
[AC_MSG_ERROR([Unable to locate required EGL headers])]) [AC_MSG_ERROR([Unable to locate required EGL headers])])
AC_CHECK_HEADERS(
[EGL/eglext.h],
[],
[AC_MSG_ERROR([Unable to locate required EGL headers])],
[#include <EGL/egl.h>])
AC_CHECK_LIB(EGL, [eglInitialize], AC_CHECK_LIB(EGL, [eglInitialize],
[COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],