diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2016-09-12 15:31:10 -0500 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2016-09-22 15:02:55 -0500 |
| commit | 57ebce14f86e512501b7d051f81f52f96f9bcedd (patch) | |
| tree | 12a8764f9b4ff658d47d219d248038fef399266f | |
| parent | 900517b80f1521d7d98c90195b87b612a36539fa (diff) | |
| download | enlightenment-57ebce14f86e512501b7d051f81f52f96f9bcedd.tar.gz | |
Find wayland protocols and wayland scanner at configure time
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0e5f3bef10..ea045110df 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 |