Add public CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT define

When clutter has been built with Wayland compositor support then we now
expose a public CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT define so that
applications can #ifdef code that depends on the api that this feature
implies.

Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Robert Bragg 2011-12-06 21:53:57 +00:00
parent 3e85ad6b95
commit af294aafe6

View File

@ -193,6 +193,7 @@ FLAVOUR_LIBS=""
FLAVOUR_CFLAGS="" FLAVOUR_CFLAGS=""
CLUTTER_BACKENDS="" CLUTTER_BACKENDS=""
CLUTTER_INPUT_BACKENDS="" CLUTTER_INPUT_BACKENDS=""
CLUTTER_CONFIG_DEFINES=
experimental_backend=no experimental_backend=no
experimental_input_backend=no experimental_input_backend=no
@ -335,6 +336,8 @@ 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
CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
#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])
]) ])
AM_CONDITIONAL(SUPPORT_WAYLAND_COMPOSITOR, [test "x$SUPPORT_WAYLAND_COMPOSITOR" = "x1"]) AM_CONDITIONAL(SUPPORT_WAYLAND_COMPOSITOR, [test "x$SUPPORT_WAYLAND_COMPOSITOR" = "x1"])
@ -508,8 +511,6 @@ AC_CACHE_SAVE
dnl === Clutter configuration ================================================= dnl === Clutter configuration =================================================
CLUTTER_CONFIG_DEFINES=
# windowing systems # windowing systems
AS_IF([test "x$SUPPORT_X11" = "x1"], AS_IF([test "x$SUPPORT_X11" = "x1"],
[CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES [CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES