From 51d2195937c4b02e1ab54b4ef382dc765f22ac6c Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Tue, 31 Jan 2012 16:35:18 +0200 Subject: [PATCH] configure: toytoolkit GL apps depend on cairo-egl 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 --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 62d36ebd..84780971 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,6 @@ AC_ARG_WITH(cairo-glesv2, AS_HELP_STRING([--with-cairo-gles2], [Use GLESv2 cairo instead of full GL]), [cairo_modules="cairo-glesv2"], [cairo_modules="cairo-gl"]) -AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS, - test x$cairo_modules == "xcairo-gl") if test x$cairo_modules == xcairo-glesv2; then AC_DEFINE([USE_CAIRO_GLESV2], [1], [Use the GLESv2 GL cairo backend]) fi @@ -141,6 +139,9 @@ fi 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) AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],,