From: Dan Williams <dan.j.williams@intel.com>
To: linux-nvdimm@lists.01.org
Subject: [ndctl PATCH 4/7] ndctl: drop asciidocs and xmlto requirement for --disable-docs
Date: Mon, 25 Apr 2016 12:50:10 -0700 [thread overview]
Message-ID: <146161381045.21779.4730246280477763860.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
In-Reply-To: <146161378966.21779.1219526957524644729.stgit@dwillia2-desk3.amr.corp.intel.com>
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 <dan.j.williams@intel.com>
---
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])
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2016-04-25 19:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-25 19:49 [ndctl PATCH 0/7] miscellaneous fixes Dan Williams
2016-04-25 19:49 ` [ndctl PATCH 1/7] ndctl, create-namespace: report failures due to namespace being mounted Dan Williams
2016-04-25 19:49 ` [ndctl PATCH 2/7] ndctl, create-namespace: check for ZONE_DEVICE=n kernels Dan Williams
2016-04-25 19:50 ` [ndctl PATCH 3/7] ndctl: fix some warnings Dan Williams
2016-04-25 19:50 ` Dan Williams [this message]
2016-04-25 19:50 ` [ndctl PATCH 5/7] ndctl: fix to_dsm_index() static analysis warning Dan Williams
2016-04-26 18:10 ` Dan Williams
2016-04-25 19:50 ` [ndctl PATCH 6/7] ndctl: fix uninitialized variable in add_dimm() Dan Williams
2016-04-25 19:50 ` [ndctl PATCH 7/7] ndctl: fix unchecked return value Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=146161381045.21779.4730246280477763860.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.com \
--cc=linux-nvdimm@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.