From patchwork Thu Oct 4 01:02:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Stone X-Patchwork-Id: 1544131 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 9D13BDFF71 for ; Thu, 4 Oct 2012 01:02:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67F899EC2F for ; Wed, 3 Oct 2012 18:02:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id AB86C9F4E5 for ; Wed, 3 Oct 2012 18:02:26 -0700 (PDT) Received: by mail-pb0-f49.google.com with SMTP id xa7so36698pbc.36 for ; Wed, 03 Oct 2012 18:02:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:x-gm-message-state; bh=D0xNb08f0ppaBe5VmUCIM4RwwYvDU5YjSfiTOpE98WA=; b=PWF14vDR/Q5N8joAla4Fs3J8yu623HogQyRA1xqJb1iC01BM8M9TUi0R9qZ1cNEyw3 COm4bzeUxKm54cYPGuwcjqWgX+MF1A8YbCDAfwbRnFuboBxnkmvQedAauj+pvyjF0RQU jpDFucu5+6BGX0hlwZH6RcuZVrEiIxytjiqGJgipkG3PomTDp6Dxn3rN5dnMNgssf689 ykaKD1wdcgsSsWqewtPeCPagN+njWokVVZS3eOw1mmIQwzGM8lEVXHIObCY9OOQif0ae kfdUr3Bz7FETcGFBK4NwLQ/LsBZS1FptIVK6hahWZosuAG0tei9lZzGkIdntRKPQ/CON 9ZAA== Received: by 10.68.226.195 with SMTP id ru3mr17062565pbc.149.1349312546145; Wed, 03 Oct 2012 18:02:26 -0700 (PDT) Received: from swamp81.fooishbar.org (115-64-155-100.static.tpgi.com.au. [115.64.155.100]) by mx.google.com with ESMTPS id qq9sm3412301pbb.24.2012.10.03.18.02.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 18:02:25 -0700 (PDT) Received: by swamp81.fooishbar.org (Postfix, from userid 1000) id 5F60517817A3; Thu, 4 Oct 2012 11:02:21 +1000 (EST) From: Daniel Stone To: dri-devel@lists.freedesktop.org Subject: [PATCH v2] configure.ac: Allow forcible disabling of Cairo support Date: Thu, 4 Oct 2012 11:02:21 +1000 Message-Id: <1349312541-5562-1-git-send-email-daniel@fooishbar.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmbWiuVPJ4vgvqHL8RHQyiQNo86JJuyOjOwGqiEL0fiIf0DsphjmWFH0lMLHSja9dOMOnIm X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org We don't want to build libdrm tests with Cairo support under Poky, since they're never used and also cause a build loop from libdrm -> cairo -> mesa-dri -> libdrm. To avoid variance in build results, introduce a --disable-cairo-tests switch. Signed-off-by: Daniel Stone --- configure.ac | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) v2: Added AC_MSG_CHECKING to make things a bit more explicit. diff --git a/configure.ac b/configure.ac index 290362c..8c28107 100644 --- a/configure.ac +++ b/configure.ac @@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support]) fi +AC_ARG_ENABLE([cairo-tests], + [AS_HELP_STRING([--enable-cairo-tests], + [Enable support for Cairo rendering in tests (default: auto)])], + [CAIRO=$enableval], [CAIRO=auto]) PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) -if test "x$HAVE_CAIRO" = xyes; then - AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support]) +AC_MSG_CHECKING([whether to enable Cairo tests]) +if test "x$CAIRO" = xauto; then + CAIRO="$HAVE_CAIRO" fi -AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes]) +if test "x$CAIRO" = xyes; then + if ! test "x$HAVE_CAIRO" = xyes; then + AC_MSG_ERROR([Cairo support required but not present]) + fi + AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support]) +fi +AC_MSG_RESULT([$CAIRO]) +AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes]) # For enumerating devices in test case PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])