derekf pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=992e3b257b8bde0717649cf4dc65a86283205da7
commit 992e3b257b8bde0717649cf4dc65a86283205da7 Author: Derek Foreman <[email protected]> Date: Mon Sep 12 15:31:10 2016 -0500 Find wayland protocols and wayland scanner at configure time --- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ce87097..ead2cb2 100644 --- a/configure.ac +++ b/configure.ac @@ -682,10 +682,19 @@ AC_MSG_CHECKING([whether wayland EGL support is enabled]) AC_MSG_RESULT([${e_cv_want_wayland_egl}]) if test "x${e_cv_want_wayland_only}" != "xno" ;then - PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 xkbcommon uuid], + PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.7 wayland-scanner >= 1.11.0 xkbcommon uuid], [ have_wayland=yes have_wayland_dep=true + AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable]) + AC_PATH_PROG([wayland_scanner], [wayland-scanner]) + if test x$wayland_scanner = x; then + PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) + wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` + fi + ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support]) ]) else --
