From dfd86de67a8c04f6d15800ea554a049159b8c148 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Tue, 15 Nov 2016 17:48:15 +0000 Subject: [PATCH] configure: fix build if wayland-client is not available Simplify the PKG_CHECK_MODULES related to Wayland to avoid the confusion of NOT_FOUND cases when there are 3 nested checks. Group those 3 checks together since there are no conditions specific to each one. Thanks to https://ci.gstreamer.net/ for alerting of the problem. https://bugzilla.gnome.org/show_bug.cgi?id=773927 --- configure.ac | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 334577123c..74c53f7aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -2259,21 +2259,16 @@ dnl **** Wayland **** translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true) AC_PATH_PROG([wayland_scanner], [wayland-scanner]) AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ - PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0, [ - PKG_CHECK_MODULES([WAYLAND_DRM], [libdrm >= 2.4.55], [ - PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [ - if test "x$wayland_scanner" != "x"; then - HAVE_WAYLAND="yes" - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - else - AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) - HAVE_WAYLAND="no" - fi - ], - [ HAVE_WAYLAND="no" - ])], - [ HAVE_WAYLAND="no" - ]) + PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [ + if test "x$wayland_scanner" != "x"; then + HAVE_WAYLAND="yes" + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) + else + AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) + HAVE_WAYLAND="no" + fi + ], + [ HAVE_WAYLAND="no" ]) ])