vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix xwayland binary location detection 

We were trying to find it with pkg-config and failing, try
AC_PATH_PROG instead
This commit is contained in:
Derek Foreman 2016-09-19 15:24:58 -05:00 committed by Mike Blumenkrantz
parent 452ff6fe76
commit c82d54a19a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -780,12 +780,16 @@ define([CHECK_MODULE_XWAYLAND],
[ [
if test "x${have_wayland}" = "xyes"; then 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_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]) AC_ARG_WITH(Xwayland, AS_HELP_STRING([--with-Xwayland=PATH], [Path to Xwayland]), [Xwayland_with="$withval"], [Xwayland_with="yes"])
if test -z "x${Xwayland}" ; then if test "x${Xwayland_with}" != "xyes"; then
HAVE_XWAYLAND_DEPS=false 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 fi
else
HAVE_XWAYLAND_DEPS=false
fi fi
]) ])
AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND}" != "xno"]) AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND}" != "xno"])