diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-07-08 11:05:10 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-07-08 11:05:10 +0100 |
| commit | 19fbbcd35846453ac9ba77c321311faec39bb6e2 (patch) | |
| tree | eb0f476a03caccd591594937742d3becd9882bf0 | |
| parent | 02b69e4d76f7f94f8faa964ebca2d01df7aaa8cf (diff) | |
| download | clutter-19fbbcd35846453ac9ba77c321311faec39bb6e2.tar.gz | |
build: Do not define Wayland support unconditionally
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
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index eeb9ac25a..da34b3a73 100644 --- a/configure.ac +++ b/configure.ac @@ -337,12 +337,6 @@ AS_IF([test "x$enable_gdk" = "xyes"], 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 # the windowing systems are not exposed in the pkg-config file 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_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], @@ -383,7 +383,6 @@ AS_IF([test "x$enable_wayland" != xno], [AC_MSG_ERROR("*** Cogl is missing Wayland support ***")], [enable_wayland=no]) ]) - ]) dnl Note this is orthogonal to the client side support and you can |