discomfitor pushed a commit to branch enlightenment-0.20.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a259de324e841c290eb0a8c93a6b00af7ec35ac6
commit a259de324e841c290eb0a8c93a6b00af7ec35ac6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri May 6 13:37:10 2016 -0400
add configure flag for xwayland binary
---
configure.ac | 4 ++--
src/modules/Makefile_xwayland.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2259e71..d1c0a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -771,8 +771,8 @@ define([CHECK_MODULE_XWAYLAND],
[
if test "x${have_wayland}" = "xyes"; then
AC_E_CHECK_PKG(XWAYLAND, [ ecore-x >= ${efl_version} ecore-audio >=
${efl_version} ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false])
- AC_PATH_PROG([XWAYLAND_BIN], [Xwayland], [false])
- if test "x${XWAYLAND_BIN}" = "xfalse"; then
+ EFL_WITH_BIN([Xwayland], [Xwayland], [Xwayland])
+ if test -z "x${Xwayland}" ; then
HAVE_XWAYLAND_DEPS=false
fi
else
diff --git a/src/modules/Makefile_xwayland.mk b/src/modules/Makefile_xwayland.mk
index 56fd137..854a6ee 100644
--- a/src/modules/Makefile_xwayland.mk
+++ b/src/modules/Makefile_xwayland.mk
@@ -7,7 +7,7 @@ src_modules_xwayland_module_la_CPPFLAGS = \
$(MOD_CPPFLAGS) \
@XWAYLAND_CFLAGS@ \
@WAYLAND_CFLAGS@ \
--DXWAYLAND_BIN=\"@XWAYLAND_BIN@\"
+-DXWAYLAND_BIN=\"@xwayland@\"
src_modules_xwayland_module_la_LIBADD = $(MOD_LIBS) @XWAYLAND_LIBS@
@WAYLAND_LIBS@
src_modules_xwayland_module_la_LDFLAGS = $(MOD_LDFLAGS)
--
