From cd460f1a2c5c23bacfb6849923f5d4596ebc3fc4 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 10 Oct 2013 20:54:25 -0700 Subject: configure: Don't bail if libdrm_nouveau isn't available. We were seriously *requiring* libdrm_nouveau unless explicitly disabled? Acked-by: Ben Widawsky Reviewed-by: Chad Versace --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 741dd749..9777bccb 100644 --- a/configure.ac +++ b/configure.ac @@ -107,8 +107,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]) -- cgit v1.2.3