configure: Adds xkb-utils automake conditional

This adds a NEEDS_XKB_UTILS automake conditional that's set to true if
either the wayland backend is enabled or the evdev input backend is
enabled since they both depend on clutter-xkb-utils.c and we need
to avoid listing the file twice since that leads to duplicate symbols
and the build fails.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index b7aeb76..28d9ca1 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -546,12 +546,10 @@ backend_source_h_priv += $(egl_tslib_h)
 endif # SUPPORT_TSLIB
 
 evdev_c_priv = \
-       $(srcdir)/evdev/clutter-xkb-utils.c             \
        $(srcdir)/evdev/clutter-device-manager-evdev.c  \
        $(srcdir)/evdev/clutter-input-device-evdev.c    \
        $(NULL)
 evdev_h_priv = \
-       $(srcdir)/evdev/clutter-xkb-utils.h             \
        $(srcdir)/evdev/clutter-device-manager-evdev.h  \
        $(srcdir)/evdev/clutter-input-device-evdev.h    \
        $(NULL)
@@ -561,6 +559,11 @@ backend_source_c_priv += $(evdev_c_priv)
 backend_source_h_priv += $(evdev_h_priv)
 endif # SUPPORT_EVDEV
 
+if NEED_XKB_UTILS
+backend_source_c_priv += $(srcdir)/evdev/clutter-xkb-utils.c
+backend_source_h_priv += $(srcdir)/evdev/clutter-xkb-utils.h
+endif
+
 cex_source_h_priv = $(srcdir)/cex100/clutter-backend-cex100.h
 cex_source_c = $(srcdir)/cex100/clutter-backend-cex100.c
 cex_h = cex100/clutter-cex100.h

diff --git a/configure.ac b/configure.ac
index 4cfabe6..79850d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -487,6 +487,8 @@ AM_CONDITIONAL(USE_TSLIB, [test "x$have_tslib" = "xyes"])
 AM_CONDITIONAL(USE_EVDEV, [test "x$have_evdev" = "xyes"])
 AM_CONDITIONAL(USE_GLD,   [test "x$have_gdl" = "xyes"])
 
+AM_CONDITIONAL(NEED_XKB_UTILS, [test "x$have_evdev" = "xyes" -O "x$SUPPORT_WAYLAND" = "x1"])
+
 dnl Instead of using AM_CFLAGS to ensure
 dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter
 dnl and cogl code we use a define in config.h instead. This helps ensure