diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2016-09-19 15:24:58 -0500 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2016-09-19 15:24:58 -0500 |
commit | 19b4bcb45dd4e694a6e30e66aa8981dd87fd0847 (patch) | |
tree | bd379233c9a0343753501adf8c479354bf36b0c1 | |
parent | 6ee205ec576702879b29ec930fb7b2400bacf384 (diff) | |
download | enlightenment-devs/derekf/conf.tar.gz |
Fix xwayland binary location detectiondevs/derekf/conf
We were trying to find it with pkg-config and failing, try
AC_PATH_PROG instead
-rw-r--r-- | configure.ac | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e35493cc02..0e5f3bef10 100644 --- a/configure.ac +++ b/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 + 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"]) |