[Intel-gfx] [PATCH intel-gpu-tools] configure: Don't bail if libdrm_nouveau isn't available.

Matt Turner mattst88 at gmail.com
Fri Oct 11 05:56:45 CEST 2013


We were seriously *requiring* libdrm_nouveau unless explicitly disabled?
---
 configure.ac | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index f65942f..43740f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,8 +92,11 @@ AM_CONDITIONAL(BUILD_ASSEMBLER, [test "x$enable_assembler" = xyes])
 # -----------------------------------------------------------------------------
 # for dma-buf tests
 AC_ARG_ENABLE(nouveau, AS_HELP_STRING([--disable-nouveau],
-	      [Enable use of nouveau API for prime tests (default: enabled)]),
-	      [NOUVEAU=$enableval], [NOUVEAU=yes])
+	      [Enable use of nouveau API for prime tests (default: auto)]),
+	      [NOUVEAU=$enableval], [NOUVEAU=auto])
+if test "x$NOUVEAU" = xauto; then
+	PKG_CHECK_EXISTS([libdrm_nouveau >= 2.4.33], [NOUVEAU=yes], [NOUVEAU=no])
+fi
 if test "x$NOUVEAU" = xyes; then
 	PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
 	AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
-- 
1.8.3.2




More information about the Intel-gfx mailing list