From mboxrd@z Thu Jan 1 00:00:00 1970 From: Colin Walters Subject: [PATCH] build: Add --disable-manpages configure option Date: Wed, 09 Jan 2013 19:46:39 -0500 Message-ID: <1357778799.21110.4.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-o8rcL8tk8WIWELZAYmXS" Return-path: 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) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --=-o8rcL8tk8WIWELZAYmXS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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(-) --=-o8rcL8tk8WIWELZAYmXS Content-Disposition: attachment; filename="0001-build-Add-disable-manpages-configure-option.patch" Content-Type: text/x-patch; name="0001-build-Add-disable-manpages-configure-option.patch"; charset="UTF-8" Content-Transfer-Encoding: 7bit >>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 --=-o8rcL8tk8WIWELZAYmXS Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --=-o8rcL8tk8WIWELZAYmXS--