[igt-dev] [PATCH i-g-t] automake: Repair overlay build

[Chris Wilson]

This partially reverts commit 9141edea9931db0ca1dfcf476da8bdd370702cc4.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala at intel.com>
Cc: Daniel Vetter <daniel.vetter at intel.com>
---
 configure.ac | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7467e6204..754a55851 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,21 @@ case "$target_cpu" in
 		;;
 esac
 
+if test x"$build_x86" = xyes; then
+	PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
+	PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
+
+	AC_CHECK_TOOL([LEG], [leg])
+	if test x"$LEG" != xleg; then
+		enable_overlay_xvlib="no"
+		enable_overlay_xlib="no"
+		AC_MSG_NOTICE([Failed to find leg, required for overlay, try : apt-get install peg])
+	fi
+else
+	enable_overlay_xvlib="no"
+	enable_overlay_xlib="no"
+	BUILD_SHADER_DEBUGGER="no"
+fi
 AM_CONDITIONAL(BUILD_X86, [test "x$build_x86" = xyes])
 
 AM_CONDITIONAL(BUILD_OVERLAY_XVLIB, [test "x$enable_overlay_xvlib" = xyes])
@@ -231,7 +246,6 @@ if test "x$NOUVEAU" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes])
 
-# enable debug symbols
 AC_ARG_ENABLE(debug,
 	      AS_HELP_STRING([--disable-debug],
 			     [Build tests without debug symbols]),
-- 
2.20.1