From patchwork Mon Apr 25 19:50:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 8931901 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 783F2BF29F for ; Mon, 25 Apr 2016 19:51:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B21F3201EC for ; Mon, 25 Apr 2016 19:51:03 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B892F2011E for ; Mon, 25 Apr 2016 19:51:01 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AB9021A1E58; Mon, 25 Apr 2016 12:51:01 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ml01.01.org (Postfix) with ESMTP id 0E5011A1E58 for ; Mon, 25 Apr 2016 12:51:00 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 25 Apr 2016 12:50:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,534,1455004800"; d="scan'208";a="952668732" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.14]) by fmsmga001.fm.intel.com with ESMTP; 25 Apr 2016 12:51:00 -0700 Subject: [ndctl PATCH 4/7] ndctl: drop asciidocs and xmlto requirement for --disable-docs From: Dan Williams To: linux-nvdimm@lists.01.org Date: Mon, 25 Apr 2016 12:50:10 -0700 Message-ID: <146161381045.21779.4730246280477763860.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <146161378966.21779.1219526957524644729.stgit@dwillia2-desk3.amr.corp.intel.com> References: <146161378966.21779.1219526957524644729.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, 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 The --disable-docs option added the ability to skip building the Documentation directory, however configure.ac was still checking needlessly for the support packages. Signed-off-by: Dan Williams --- configure.ac | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 01f347a7f137..c50ba3dfc1d9 100644 --- a/configure.ac +++ b/configure.ac @@ -32,13 +32,23 @@ AC_PREFIX_DEFAULT([/usr]) AC_PROG_SED AC_PROG_MKDIR_P + +AC_ARG_ENABLE([docs], + AS_HELP_STRING([--disable-docs], + [disable documentation build @<:@default=enabled@:>@]), + [], enable_docs=yes) +AS_IF([test "x$enable_docs" = "xyes"], [ + AC_DEFINE(ENABLE_DOCS, [1], [Documentation / man pages.]) +]) +AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" = "xyes"]) + AC_CHECK_PROG(ASCIIDOC, [asciidoc], [$(which asciidoc)], [missing]) -if test "x$ASCIIDOC" = xmissing; then +if test "x$ASCIIDOC" = xmissing -a "x$enable_docs" = "xyes"; then AC_MSG_ERROR([asciidoc needed to build documentation]) fi AC_SUBST([ASCIIDOC]) AC_CHECK_PROG(XMLTO, [xmlto], [$(which xmlto)], [missing]) -if test "x$XMLTO" = xmissing; then +if test "x$XMLTO" = xmissing -a "x$enable_docs" = "xyes"; then AC_MSG_ERROR([xmlto needed to build documentation]) fi AC_SUBST([XMLTO]) @@ -58,15 +68,6 @@ AS_IF([test "x$enable_logging" = "xyes"], [ AC_DEFINE(ENABLE_LOGGING, [1], [System logging.]) ]) -AC_ARG_ENABLE([docs], - AS_HELP_STRING([--disable-docs], - [disable documentation build @<:@default=enabled@:>@]), - [], enable_docs=yes) -AS_IF([test "x$enable_docs" = "xyes"], [ - AC_DEFINE(ENABLE_DOCS, [1], [Documentation / man pages.]) -]) -AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" = "xyes"]) - AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]), [], [enable_debug=no])