[vlc-commits] [Git][videolan/vlc][master] configure: make it possible to override wayland-scanner

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
75e52f61 by Yann Lochet at 2022-12-01T09:00:22+00:00
configure: make it possible to override wayland-scanner

When cross-compiling, PKG_CONFIG might pick up the wayland-scanner
from the sysroot.

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -3437,10 +3437,12 @@ AS_IF([test "${enable_wayland}" != "no"], [
   PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl],, [
     wl_err="$wl_err ${WAYLAND_EGL_PKG_ERRORS}."
   ])
-  PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner >= 1.15], [
-    WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
-  ], [
-    wl_err="$wl_err ${WAYLAND_SCANNER_PKG_ERRORS}."
+  AS_VAR_SET_IF(WAYLAND_SCANNER, [],[
+    PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner >= 1.15], [
+      WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
+    ], [
+      wl_err="$wl_err ${WAYLAND_SCANNER_PKG_ERRORS}."
+    ])
   ])
 
   dnl wayland-protocols



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/75e52f617bf3273f4883b56c4175d68211e02d14

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/75e52f617bf3273f4883b56c4175d68211e02d14
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance