devilhorns pushed a commit to branch devs/devilhorns/wayland.
commit 18c4ec999edfa02d60cfbe3802cb482c8f336534
Author: Chris Michael <[email protected]>
Date: Thu Mar 7 08:18:02 2013 +0000
Add wl_shell back in as a module when building with Wayland Client
support.
In order to render wayland clients, we need to provide a shell
interface for the clients to send messages to.
Signed-off-by: Chris Michael <[email protected]>
---
configure.ac | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f1fafea..932d0cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -677,6 +677,12 @@ define([CHECK_MODULE_MUSIC_CONTROL],
AC_E_CHECK_PKG(MUSIC_CONTROL, [ ecore >= $efl_version eina >= $efl_version
edbus2 ], [], [MUSIC_CONTROL=false])
])
+AM_CONDITIONAL(WL_SHELL, false)
+define([CHECK_MODULE_WL_SHELL],
+[
+ AC_E_CHECK_PKG(WL_SHELL, [ ecore >= $efl_version eina >= $efl_version
wayland-server], [], [WL_SHELL=false])
+])
+
##have_exchange=no
##AC_ARG_ENABLE(exchange,
## AC_HELP_STRING([--disable-exchange], [disable Exchange support
@<:@default=detect@:>@]),
@@ -880,7 +886,7 @@ AC_E_OPTIONAL_MODULE([music_control], true,
[CHECK_MODULE_MUSIC_CONTROL])
AC_E_OPTIONAL_MODULE([contact], true)
if test "x${have_wayland_clients}" = "xyes"; then
- AC_E_OPTIONAL_MODULE([wl_shell], true)
+ AC_E_OPTIONAL_MODULE([wl_shell], true, [CHECK_MODULE_WL_SHELL])
fi
SUSPEND=""
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
