From patchwork Sun Feb 8 04:35:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 22561 X-Patchwork-Delegate: jk@ozlabs.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 9B6F8DDECA for ; Sun, 8 Feb 2009 15:39:16 +1100 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D6B61DDDDB; Sun, 8 Feb 2009 15:39:05 +1100 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1+VbtdAPShN5FSdIc92M4fHRVMpaNpe0Ug@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n184cwHM011740 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 8 Feb 2009 04:38:58 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n184cvvi011739; Sun, 8 Feb 2009 04:38:57 GMT Message-Id: <20090208043550.755762324@am.sony.com> References: <20090208043550.681477743@am.sony.com> In-Reply-To: <20090208043550.681477743@am.sony.com> User-Agent: quilt/0.46-1 Date: Sat, 07 Feb 2009 20:35:51 -0800 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=option-with-twin.diff X-Virus-Scanned: ClamAV 0.93.3/8963/Sat Feb 7 05:53:02 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY,URIBL_SBL autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Sun, 08 Feb 2009 04:39:00 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 1/4] petitboot: Add --with-twin config option X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Make the build of the GUI components conditional on the installation of libtwin. Also, add options --with-twin and --without-twin to allow the user to override the default. Signed-off-by: Geoff Levand --- configure.ac | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,23 @@ fi AC_PROG_CC AC_PROG_INSTALL -PKG_CHECK_MODULES([twin], [libtwin]) +AC_ARG_WITH([twin], + [AS_HELP_STRING([--with-twin], + [build GUI versions using the twin window system])], + [], + [with_twin=check]) + +LIBTWIN= +AS_IF([test "x$with_twin" != xno], + [AC_CHECK_LIB([twin], [main], + [AC_SUBST([LIBTWIN], ["-ltwin"]) + AC_DEFINE([HAVE_LIBTWIN], [1], [Define if you have libtwin]) + PKG_CHECK_MODULES([twin], [libtwin]) ], + [if test "x$with_twin" != xcheck; then + AC_MSG_FAILURE([--with-twin was given, but test for twin failed]) + fi], + [])]) + mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list \ lib/waiter lib/log