diff mbox

[ndctl,4/7] ndctl: drop asciidocs and xmlto requirement for --disable-docs

Message ID 146161381045.21779.4730246280477763860.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive)
State Accepted
Commit 480ba9350456
Headers show

Commit Message

Dan Williams April 25, 2016, 7:50 p.m. UTC 
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 mbox

Patch

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])