[PATCH 1/2] configure: toytoolkit GL apps depend on cairo-egl

[Pekka Paalanen]

On Tue, 31 Jan 2012 09:41:35 -0500
Kristian Høgsberg <krh at bitplanet.net> wrote:

> On Tue, Jan 31, 2012 at 9:35 AM, Pekka Paalanen <ppaalanen at gmail.com> wrote:
> > 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".
> 
> Makes sense, thanks.
> Kristian

Sorry, forgot to mention: this is a candidate for 0.85.

Thanks,
pq

> 
> > Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
> > ---
> >  configure.ac |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index 62d36eb..8478097 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],,
> > --
> > 1.7.3.4
> >