mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 12:45:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: fix build if libdrm is not available

Browse source 
If the NOT_FOUND part of the check PKG_CHECK_MODULES is not written, it
defaults to error. Addind the else clause of this check as
HAVE_WAYLAND="no"

https://bugzilla.gnome.org/show_bug.cgi?id=773927
This commit is contained in:
Luis de Bethencourt 2016-11-15 11:59:45 +00:00 committed by Luis
parent 9f690fa241
commit 2132b6b452
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
configure.ac
View file

@ -2260,19 +2260,20 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true)
AC_PATH_PROG([wayland_scanner], [wayland-scanner]) AC_PATH_PROG([wayland_scanner], [wayland-scanner])
AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0, [ PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0, [
PKG_CHECK_MODULES([WAYLAND_DRM], [libdrm >= 2.4.55]) PKG_CHECK_MODULES([WAYLAND_DRM], [libdrm >= 2.4.55], [
PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [
if test "x$wayland_scanner" != "x"; then if test "x$wayland_scanner" != "x"; then
HAVE_WAYLAND="yes" HAVE_WAYLAND="yes"
AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
else else
AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin])
HAVE_WAYLAND="no" HAVE_WAYLAND="no"
fi fi
], ],
[ HAVE_WAYLAND="no"
])],
[ HAVE_WAYLAND="no" [ HAVE_WAYLAND="no"
])], ])
[ HAVE_WAYLAND="no"
]) ])
]) ])