diff options
| author | Pekka Paalanen <ppaalanen@gmail.com> | 2012-01-31 16:35:18 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-02-08 15:25:04 -0500 |
| commit | 89d714f7c590116b0163e6f1499c66c01600b401 (patch) | |
| tree | abe2f4f3a621f25c5d50495b8663415179c10b0f | |
| parent | 26fdb6d0cd83d316de71906530d29c32d415f149 (diff) | |
| download | weston-89d714f7c590116b0163e6f1499c66c01600b401.tar.gz | |
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 <ppaalanen@gmail.com>
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3522bee5..55b48de6 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],, |