forked from enlightenment/enlightenment
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:
parent
1f43764db0
commit
47cdbdb5af
14
configure.ac
14
configure.ac
|
@ -788,12 +788,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
|
||||
fi
|
||||
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
|
||||
HAVE_XWAYLAND_DEPS=false
|
||||
AC_PATH_PROG(xwayland, Xwayland, "no")
|
||||
fi
|
||||
if test "x${xwayland}" == "xno"; then
|
||||
AC_MSG_ERROR([Xwayland enabled but not found.])
|
||||
fi
|
||||
fi
|
||||
])
|
||||
AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND}" != "xno"])
|
||||
|
|
Loading…
Reference in New Issue