[vlc-commits] configure: look for wayland-protocols

Rémi Denis-Courmont git at videolan.org
Sun Jan 29 14:36:58 CET 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 29 15:09:18 2017 +0200| [d51ce71eefc19d72d736a24dfd1e2f0c7fe24f81] | committer: Rémi Denis-Courmont

configure: look for wayland-protocols

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d51ce71eefc19d72d736a24dfd1e2f0c7fe24f81
---

 configure.ac | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index 3a7805d..4649bdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3128,6 +3128,15 @@ have_wayland_egl="no"
 
 AS_IF([test "${enable_wayland}" != "no"], [
   PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= 1.5.91], [
+    AC_MSG_CHECKING([for the Wayland protocols])
+    PKG_CHECK_EXISTS([wayland-protocols >= 1.4], [
+      WAYLAND_PROTOCOLS="$(${PKG_CONFIG} wayland-protocols --variable pkgdatadir)"
+      AC_MSG_RESULT([${WAYLAND_PROTOCOLS}])
+    ], [
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors 'wayland-protocols >= 1.4')])
+    ])
+
     AC_MSG_CHECKING([for the Wayland scanner])
     PKG_CHECK_EXISTS([wayland-scanner], [
       WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
@@ -3152,6 +3161,7 @@ AS_IF([test "${enable_wayland}" != "no"], [
     ])
   ])
 ])
+AC_SUBST([WAYLAND_PROTOCOLS])
 AC_SUBST([WAYLAND_SCANNER])
 AM_CONDITIONAL([HAVE_WAYLAND], [test "${have_wayland}" = "yes"])
 AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "${have_wayland_egl}" = "yes"])



More information about the vlc-commits mailing list