aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-09-19 15:24:58 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-10-04 09:37:15 -0400
commitc82d54a19a550e506949ba91d96cf875556eaf90 (patch)
treeb0d255633f0a537733fe7a211aba0a3a5d088546 /configure.ac
parentUpdate wayland readme file (diff)
downloadenlightenment-c82d54a19a550e506949ba91d96cf875556eaf90.tar.gz
Fix xwayland binary location detection
We were trying to find it with pkg-config and failing, try AC_PATH_PROG instead
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index d8db15858..86f5f3d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,12 +780,16 @@ 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])
- EFL_WITH_BIN([Xwayland], [Xwayland], [Xwayland])
- if test -z "x${Xwayland}" ; then
- HAVE_XWAYLAND_DEPS=false
+ AC_ARG_WITH(Xwayland, AS_HELP_STRING([--with-Xwayland=PATH], [Path to Xwayland]), [Xwayland_with="$withval"], [Xwayland_with="yes"])
+ if test "x${Xwayland_with}" != "xyes"; then
+ xwayland=$Xwayland_with
+ AC_SUBST(xwayland)
+ else
+ AC_PATH_PROG(xwayland, Xwayland, "no")
+ fi
+ if test "x${xwayland}" == "xno"; then
+ AC_MSG_ERROR([Xwayland enabled but not found.])
fi
- else
- HAVE_XWAYLAND_DEPS=false
fi
])
AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND}" != "xno"])