From 7a19a870b2932d46f8bf3c2255794d4533f96edd Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Wed, 2 Jul 2014 11:44:55 -0400 Subject: [PATCH] add xwayland to configure.ac Signed-off-by: Chris Michael Conflicts: configure.ac --- configure.ac | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac index 3a59fcb5b..4c1576369 100644 --- a/configure.ac +++ b/configure.ac @@ -885,6 +885,17 @@ define([CHECK_MODULE_WL_DRM], ]) AM_CONDITIONAL([HAVE_WL_DRM], [test "x${WL_DRM}" = "xtrue"]) +define([CHECK_MODULE_XWAYLAND], +[ + if test "x${e_cv_want_wayland_only}" = "xyes"; then + AC_E_CHECK_PKG(XWAYLAND, [ ecore >= $efl_version eina >= $efl_version ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false]) + AC_PATH_PROGS([XWAYLAND_BIN], [Xwayland], [HAVE_XWAYLAND_DEPS=false], [/sbin:/usr/sbin:$PATH]) + else + HAVE_XWAYLAND_DEPS=false + fi +]) +AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND_DEPS}" = "xtrue"]) + AC_E_OPTIONAL_MODULE([ibar], true) AC_E_OPTIONAL_MODULE([clock], true) AC_E_OPTIONAL_MODULE([pager], true) @@ -941,6 +952,7 @@ AC_E_OPTIONAL_MODULE([wl_drm], $have_wayland, [CHECK_MODULE_WL_DRM]) #AC_E_OPTIONAL_MODULE([wl_screenshot], true, [CHECK_MODULE_WL_SCREENSHOT]) AC_E_OPTIONAL_MODULE([policy_mobile], true) AC_E_OPTIONAL_MODULE([geolocation], true) +AC_E_OPTIONAL_MODULE([xwayland], $have_wayland, [CHECK_MODULE_XWAYLAND]) HALT="/sbin/shutdown -h now" REBOOT="/sbin/shutdown -r now" @@ -1071,6 +1083,7 @@ src/modules/music-control/module.desktop src/modules/packagekit/module.desktop src/modules/wl_desktop_shell/module.desktop src/modules/wl_screenshot/module.desktop +src/modules/xwayland/module.desktop data/xsession/enlightenment.desktop data/etc/sysactions.conf data/units/enlightenment.service