From 0a8df0685e7a9d6db3a1765a9de701565c759493 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Thu, 23 Feb 2017 13:37:58 -0500 Subject: [PATCH] configure.ac: check require_basic_egl only if egl enabled Otherwise the configuration fails when building independant libs like vdpau, vaapi or omx Fixes: 1ac40173c2a ("configure.ac: simplify EGL requirements for drivers dependent on EGL") Signed-off-by: Leo Liu Reviewed-by: Emil Velikov Cc: "17.0" (cherry picked from commit 5398d006de3d2bd668e3fc4b80a3de0c101a3e43) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov Conflicts: configure.ac --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8448736be31..399166ac8ec 100644 --- a/configure.ac +++ b/configure.ac @@ -2328,7 +2328,9 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED]) require_libdrm "radeonsi" radeon_gallium_llvm_check $LLVM_REQUIRED_RADEONSI "radeonsi" - require_basic_egl "radeonsi" + if test "x$enable_egl" = xyes; then + require_basic_egl "radeonsi" + fi ;; xnouveau) HAVE_GALLIUM_NOUVEAU=yes