From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH intel-gpu-tools] configure: Don't bail if libdrm_nouveau isn't available. Date: Thu, 10 Oct 2013 21:00:51 -0700 Message-ID: <20131011040050.GA1116@bwidawsk.net> References: <1381463805-10521-1-git-send-email-mattst88@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id 19409E5C12 for ; Thu, 10 Oct 2013 21:00:56 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1381463805-10521-1-git-send-email-mattst88@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Matt Turner Cc: Intel GFX , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Thu, Oct 10, 2013 at 08:56:45PM -0700, Matt Turner wrote: > We were seriously *requiring* libdrm_nouveau unless explicitly disabled? Acked-by: Ben Widawsky > --- > 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 > -- Ben Widawsky, Intel Open Source Technology Center