diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-27 16:42:40 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-27 16:56:14 +0100 |
| commit | 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba (patch) | |
| tree | 0a5a606a5d2b9fadc25919f4a3f7eb65f75aaeaa | |
| parent | b416224d30ea5ace492f1497101a172a6fb32997 (diff) | |
| download | clutter-74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba.tar.gz | |
build: Enable Cogl support with Wayland
The Wayland backend is based on Cogl, so we need to turn on the
SUPPORT_COGL flag to avoid breaking the build; this always went
unnoticed because we usually build the Wayland client backend
with the X11 backend.
Reported-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27)
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f5afe1277..355c95bbd 100644 --- a/configure.ac +++ b/configure.ac @@ -310,6 +310,7 @@ AS_IF([test "x$enable_wayland" = "xyes"], experimental_backend="yes" SUPPORT_WAYLAND=1 + SUPPORT_COGL=1 PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0], [ @@ -337,7 +338,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"], [ PKG_CHECK_EXISTS([wayland-server], [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], []) + SUPPORT_WAYLAND_COMPOSITOR=1 + SUPPORT_COGL=1 + CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1" AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support]) @@ -359,8 +363,8 @@ AS_IF([test "x$enable_cex100" = "xyes"], experimental_backend="yes" - SUPPORT_COGL=1 SUPPORT_CEX100=1 + SUPPORT_COGL=1 have_gdl=no AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes]) |