sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Do not define Wayland support unconditionally

Browse source 
Now that we discover at configure time if Wayland is available, we
should only enable support if we find it.

https://bugzilla.gnome.org/show_bug.cgi?id=752104
This commit is contained in:
Emmanuele Bassi 2015-07-08 11:05:10 +01:00
parent 02b69e4d76
commit 19fbbcd358
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure.ac
View file

@ -337,12 +337,6 @@ AS_IF([test "x$enable_gdk" = "xyes"],
AS_IF([test "x$enable_wayland" != xno], AS_IF([test "x$enable_wayland" != xno],
[ [
CLUTTER_BACKENDS="$CLUTTER_BACKENDS wayland"
CLUTTER_INPUT_BACKENDS="$CLUTTER_INPUT_BACKENDS wayland"
SUPPORT_WAYLAND=1
SUPPORT_COGL=1
# We need to manually check for Wayland support in Cogl because # We need to manually check for Wayland support in Cogl because
# the windowing systems are not exposed in the pkg-config file # the windowing systems are not exposed in the pkg-config file
saved_CFLAGS="${CFLAGS}" saved_CFLAGS="${CFLAGS}"
@ -371,6 +365,12 @@ AS_IF([test "x$enable_wayland" != xno],
[ [
BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-cursor wayland-client xkbcommon" BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-cursor wayland-client xkbcommon"
BACKEND_PC_FILES_PRIVATE="$BACKEND_PC_FILES_PRIVATE gdk-pixbuf-2.0" BACKEND_PC_FILES_PRIVATE="$BACKEND_PC_FILES_PRIVATE gdk-pixbuf-2.0"
CLUTTER_BACKENDS="$CLUTTER_BACKENDS wayland"
CLUTTER_INPUT_BACKENDS="$CLUTTER_INPUT_BACKENDS wayland"
SUPPORT_WAYLAND=1
SUPPORT_COGL=1
], ],
[ [
AS_IF([test "x$enable_wayland" = xyes], AS_IF([test "x$enable_wayland" = xyes],
@ -383,7 +383,6 @@ AS_IF([test "x$enable_wayland" != xno],
[AC_MSG_ERROR("*** Cogl is missing Wayland support ***")], [AC_MSG_ERROR("*** Cogl is missing Wayland support ***")],
[enable_wayland=no]) [enable_wayland=no])
]) ])
]) ])
dnl Note this is orthogonal to the client side support and you can dnl Note this is orthogonal to the client side support and you can