summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-05-06 13:37:10 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-05-06 13:37:10 -0400
commit720074e926ce9bb90e214bf844483fb9a26f8f12 (patch)
treec440b3f2ff9048c758bb095f9fc2d9cfb0bc111c
parentef1772b8cb992b115411f01e1915fca015eea158 (diff)
add configure flag for xwayland binary
-rw-r--r--configure.ac4
-rw-r--r--src/modules/Makefile_xwayland.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index daaba6438..5674fda03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -771,8 +771,8 @@ define([CHECK_MODULE_XWAYLAND],
771[ 771[
772 if test "x${have_wayland}" = "xyes"; then 772 if test "x${have_wayland}" = "xyes"; then
773 AC_E_CHECK_PKG(XWAYLAND, [ ecore-x >= ${efl_version} ecore-audio >= ${efl_version} ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false]) 773 AC_E_CHECK_PKG(XWAYLAND, [ ecore-x >= ${efl_version} ecore-audio >= ${efl_version} ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false])
774 AC_PATH_PROG([XWAYLAND_BIN], [Xwayland], [false]) 774 EFL_WITH_BIN([Xwayland], [Xwayland], [Xwayland])
775 if test "x${XWAYLAND_BIN}" = "xfalse"; then 775 if test -z "x${Xwayland}" ; then
776 HAVE_XWAYLAND_DEPS=false 776 HAVE_XWAYLAND_DEPS=false
777 fi 777 fi
778 else 778 else
diff --git a/src/modules/Makefile_xwayland.mk b/src/modules/Makefile_xwayland.mk
index 56fd137fa..854a6ee52 100644
--- a/src/modules/Makefile_xwayland.mk
+++ b/src/modules/Makefile_xwayland.mk
@@ -7,7 +7,7 @@ src_modules_xwayland_module_la_CPPFLAGS = \
7$(MOD_CPPFLAGS) \ 7$(MOD_CPPFLAGS) \
8@XWAYLAND_CFLAGS@ \ 8@XWAYLAND_CFLAGS@ \
9@WAYLAND_CFLAGS@ \ 9@WAYLAND_CFLAGS@ \
10-DXWAYLAND_BIN=\"@XWAYLAND_BIN@\" 10-DXWAYLAND_BIN=\"@xwayland@\"
11 11
12src_modules_xwayland_module_la_LIBADD = $(MOD_LIBS) @XWAYLAND_LIBS@ @WAYLAND_LIBS@ 12src_modules_xwayland_module_la_LIBADD = $(MOD_LIBS) @XWAYLAND_LIBS@ @WAYLAND_LIBS@
13src_modules_xwayland_module_la_LDFLAGS = $(MOD_LDFLAGS) 13src_modules_xwayland_module_la_LDFLAGS = $(MOD_LDFLAGS)