From: David Lamparter <equinox@diac24.net>
Date: Sat, 18 Aug 2018 15:06:22 +0000 (+0200)
Subject: doc: html default off
X-Git-Tag: frr-7.1-dev~404^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=50dc6dbd693912392ec56e8d820c531eaad93597;p=mirror%2Ffrr.git

doc: html default off

... RPM builds break if we enable this unconditionally; should really
change this in CI instead.

Signed-off-by: David Lamparter <equinox@diac24.net>
---

diff --git a/configure.ac b/configure.ac
index aadf8a9303..91e5990b77 100755
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,7 @@ AC_ARG_ENABLE(vtysh,
 AC_ARG_ENABLE(doc,
   AS_HELP_STRING([--disable-doc], [do not build docs]))
 AC_ARG_ENABLE(doc-html,
-  AS_HELP_STRING([--disable-doc-html], [do not build HTML docs]))
+  AS_HELP_STRING([--enable-doc-html], [build HTML docs]))
 AC_ARG_ENABLE(zebra,
   AS_HELP_STRING([--disable-zebra], [do not build zebra daemon]))
 AC_ARG_ENABLE(bgpd,
@@ -1341,7 +1341,7 @@ FRR_INCLUDES
 dnl disable doc check
 AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
 AM_CONDITIONAL(DOC, test "${enable_doc}" != "no")
-AM_CONDITIONAL(DOC_HTML, test "${enable_doc_html}" != "no")
+AM_CONDITIONAL(DOC_HTML, test "${enable_doc_html}" = "yes")
 
 dnl --------------------
 dnl Daemon disable check