mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: toytoolkit GL apps depend on cairo-egl

Browse Source 
Do not build toytoolkit applications that use GL, if Cairo-egl is not
available. These applications (which happen to be also the full GL
clients) do not work at all without Cairo-egl, and fail at runtime with
"unable to acquire window surface".

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-01-31 16:35:18 +02:00 committed by Kristian Høgsberg
parent a4f80f34e2
commit 51d2195937
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -100,8 +100,6 @@ AC_ARG_WITH(cairo-glesv2, AS_HELP_STRING([--with-cairo-gles2],
[Use GLESv2 cairo instead of full GL]), [Use GLESv2 cairo instead of full GL]),
[cairo_modules="cairo-glesv2"], [cairo_modules="cairo-glesv2"],
[cairo_modules="cairo-gl"]) [cairo_modules="cairo-gl"])
AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS,
test x$cairo_modules == "xcairo-gl")
if test x$cairo_modules == xcairo-glesv2; then if test x$cairo_modules == xcairo-glesv2; then
AC_DEFINE([USE_CAIRO_GLESV2], [1], [Use the GLESv2 GL cairo backend]) AC_DEFINE([USE_CAIRO_GLESV2], [1], [Use the GLESv2 GL cairo backend])
fi fi
@ -141,6 +139,9 @@ fi
AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")
AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS,
test x$cairo_modules == "xcairo-gl" -a "x$have_cairo_egl" = "xyes")
AM_CONDITIONAL(ENABLE_DESKTOP_SHELL, true) AM_CONDITIONAL(ENABLE_DESKTOP_SHELL, true)
AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],, AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],,