From patchwork Fri Oct 11 03:56:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Turner X-Patchwork-Id: 3020481 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1D471BF924 for ; Fri, 11 Oct 2013 03:57:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 423212030D for ; Fri, 11 Oct 2013 03:57:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 174432030B for ; Fri, 11 Oct 2013 03:57:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED0F1E6AA7 for ; Thu, 10 Oct 2013 20:57:13 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id AFD13E6498 for ; Thu, 10 Oct 2013 20:56:45 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id d41so1555930eek.22 for ; Thu, 10 Oct 2013 20:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2Q3tx/Im7SVvvLInUMOmBsOHb6xstvMuiu6wKUe2WnM=; b=Cw0ph9oowL3mzmF9jhxI//lgk022e0Z5Sx8+Y3fzYor2W8NWE1DOEdfuWHQXiXuuAk HKp3/VFWcYkCs9TAPY9IS/m7LhOg3Tb28cjzQKGo3FvPLCjbPBKrGYOvLgUxbuVwg5Gx +tj0Q77//0053S37JJmHj8ZooLVJdNaDqtLKezt4CgZKwQQ8XLyV492sV4o/jC4NmtqL wJHQkfpIYUrkwmS0nccEHrfBoj6aRvs6VUGZYREoCUDF45kVs27g0FPa4NDA6kzeE6l+ qV2XHe/j2yfBqKZn/nm0JDlLrI/eq1IXjthAtym1pEzIV0utBHC0o5Gm1+InPo7+2Qix mKVQ== X-Received: by 10.15.43.13 with SMTP id w13mr25702580eev.37.1381463804668; Thu, 10 Oct 2013 20:56:44 -0700 (PDT) Received: from localhost ([108.161.26.224]) by mx.google.com with ESMTPSA id a43sm109251416eep.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 20:56:43 -0700 (PDT) From: Matt Turner To: Intel GFX Date: Thu, 10 Oct 2013 20:56:45 -0700 Message-Id: <1381463805-10521-1-git-send-email-mattst88@gmail.com> X-Mailer: git-send-email 1.8.3.2 Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH intel-gpu-tools] configure: Don't bail if libdrm_nouveau isn't available. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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])