From patchwork Thu Jan 10 00:46:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Walters X-Patchwork-Id: 1958051 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 D587ADF2EB for ; Thu, 10 Jan 2013 00:55:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95175E606D for ; Wed, 9 Jan 2013 16:55:32 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 521 seconds by postgrey-1.32 at gabe; Wed, 09 Jan 2013 16:55:21 PST Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F0FEE5FA2 for ; Wed, 9 Jan 2013 16:55:21 -0800 (PST) Received: from compute3.internal (compute3.nyi.mail.srv.osa [10.202.2.43]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 308A520984; Wed, 9 Jan 2013 19:46:40 -0500 (EST) Received: from frontend1.nyi.mail.srv.osa ([10.202.2.160]) by compute3.internal (MEProxy); Wed, 09 Jan 2013 19:46:40 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=subject:from:to:cc:content-type:date :message-id:mime-version; s=smtpout; bh=rJXks+zttvN6vGJk86b7I7H4 VWo=; b=CxpW9PnnrV7bd+frqymrh44bl54+uFMJBlkYjEveuNbUsWxiikfMpVTY twfO725GR+IJ6sJ/c+glLUa/WulrL7DvXu33LjETBupgfK405okF1Tuoiv0RZ4S0 yGs+4b+UTsow22Sl+FJgiGClyd5Pt1iu1NoqA9DanaRWa4U6kyM= X-Sasl-enc: xgoIgAqudzjEkUXZbnbJr1zOgtYB4o9FvcXRFlcSGput 1357778799 Received: from [192.168.1.6] (unknown [50.138.225.153]) by mail.messagingengine.com (Postfix) with ESMTPA id CC8A88E0208; Wed, 9 Jan 2013 19:46:39 -0500 (EST) Subject: [PATCH] build: Add --disable-manpages configure option From: Colin Walters To: dri-devel@lists.freedesktop.org Date: Wed, 09 Jan 2013 19:46:39 -0500 Message-ID: <1357778799.21110.4.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-27.el6) 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: , 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 It's not enough to check for xsltproc - the system may not have the docbook stylesheets installed. This patch also allows builders to override the generation/installation of manpages entirely; for example, manpages are of no use for embedded systems, so it's better to not even waste the power building them. --- configure.ac | 10 ++++++++-- man/Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) From eb0f352dc35e5b4a75abd27f1877b37bd1d536c6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 9 Jan 2013 19:35:05 -0500 Subject: [PATCH] build: Add --disable-manpages configure option It's not enough to check for xsltproc - the system may not have the docbook stylesheets installed. This patch also allows builders to override the generation/installation of manpages entirely; for example, manpages are of no use for embedded systems, so it's better to not even waste the power building them. This is equivalent to the code in systemd and kmod's configure.ac. --- configure.ac | 10 ++++++++-- man/Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0e6db86..273b9b8 100644 --- a/configure.ac +++ b/configure.ac @@ -226,8 +226,14 @@ if test "x$HAVE_LIBUDEV" = xyes; then fi AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes]) -AC_PATH_PROG(XSLTPROC, xsltproc) -AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) +AC_ARG_ENABLE([manpages], + AS_HELP_STRING([--disable-manpages], [disable manpages @<:@default=enabled@:>@]), + [], enable_manpages=yes) +AM_CONDITIONAL([BUILD_MANPAGES], [test "x$enable_manpages" = "xyes"]) +AC_PATH_PROG([XSLTPROC], [xsltproc], [no]) +AS_IF([test "x$XSLTPROC" = "xno" && test "x$enable_manpages" = "xyes"], [ + AC_MSG_ERROR([xsltproc command not found, try ./configure --disable-manpages]) +]) if test "x$INTEL" != "xno" -o "x$RADEON" != "xno" -o "x$NOUVEAU" != "xno" -o "x$OMAP" != "xno"; then # Check for atomic intrinsics diff --git a/man/Makefile.am b/man/Makefile.am index 32acd07..42c3616 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,7 +22,7 @@ CLEANFILES = EXTRA_DIST = man_MANS = -if HAVE_XSLTPROC +if BUILD_MANPAGES CLEANFILES += $(MANPAGES) $(MANPAGES_ALIASES) EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES) $(XML_FILES) @@ -51,4 +51,4 @@ XSLTPROC_PROCESS_MAN = \ %.7: %.xml $(XSLTPROC_PROCESS_MAN) -endif # HAVE_XSLTPROC +endif # BUILD_MANPAGES -- 1.7.1