isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Enable Cogl support with Wayland

Browse Source 
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>
This commit is contained in:
Emmanuele Bassi 2013-06-27 16:42:40 +01:00
parent 180e7d74f3
commit 1fb0295ba1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -316,6 +316,7 @@ AS_IF([test "x$enable_wayland" = "xyes"],
experimental_backend="yes" experimental_backend="yes"
SUPPORT_WAYLAND=1 SUPPORT_WAYLAND=1
SUPPORT_COGL=1
PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0], PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0],
[ [
@ -343,7 +344,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"],
[ [
PKG_CHECK_EXISTS([wayland-server], PKG_CHECK_EXISTS([wayland-server],
[BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], []) [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], [])
SUPPORT_WAYLAND_COMPOSITOR=1 SUPPORT_WAYLAND_COMPOSITOR=1
SUPPORT_COGL=1
CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
#define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1" #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1"
AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support]) AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support])
@ -365,8 +369,8 @@ AS_IF([test "x$enable_cex100" = "xyes"],
experimental_backend="yes" experimental_backend="yes"
SUPPORT_COGL=1
SUPPORT_CEX100=1 SUPPORT_CEX100=1
SUPPORT_COGL=1
have_gdl=no have_gdl=no
AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes]) AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes])