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

build: Ensure EGL related variables are defined even when EGL_CHECKED=yes

Browse Source 
When checking for EGL earlier in the configure script (ie EGL_CHECKED is
"yes"), we did not execute some EGL code. Let's split that code in two:
  - A first part that has a last change to check for EGL
  - A second one that defines variables and that should always been run
    in an EGL build
This commit is contained in:
Damien Lespiau 2011-05-12 15:51:01 +01:00
parent 3530354d5d
commit 780c6fe05d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -644,12 +644,17 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL" COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"
] ]
) )
])
AS_IF([test "x$NEED_EGL" = "xyes"],
[
SUPPORT_EGL=yes SUPPORT_EGL=yes
GL_WINSYS_APIS="$GL_WINSYS_APIS egl" GL_WINSYS_APIS="$GL_WINSYS_APIS egl"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_SUPPORT"
AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], AC_DEFINE([COGL_HAS_FULL_WINSYS], [1],
[Cogl can create its own OpenGL context]) [Cogl can create its own OpenGL context])
]) ])
AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "xyes"]) AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "xyes"])