diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-09-05 11:25:24 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-09 20:01:08 +0200 |
| commit | f4f2f2ccac75f5498924288adf814b54ee1e1c81 (patch) | |
| tree | 7f23fce01fb6bbb509cb6f1e9ae4de683bab75a4 /configure.ac | |
| parent | Merge pull request #2862 from opensourcerouting/non-recursive (diff) | |
| download | frr-f4f2f2ccac75f5498924288adf814b54ee1e1c81.tar.xz frr-f4f2f2ccac75f5498924288adf814b54ee1e1c81.zip | |
build: fix not building docs w/o sphinx
Can't build manpages without sphinx-build, oops...
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 521d27a68..27fca411d 100755 --- a/configure.ac +++ b/configure.ac @@ -1351,8 +1351,13 @@ FRR_INCLUDES ])dnl dnl disable doc check -AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no]) -AM_CONDITIONAL(DOC, test "${enable_doc}" != "no") +AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [/bin/false]) +if test "$SPHINXBUILD" = "/bin/false"; then + if test "${enable_doc}" = "yes"; then + AC_MSG_ERROR([Documentation was explicitly requested with --enable-doc but sphinx-build is not available. Please disable docs or install sphinx.]) + fi +fi +AM_CONDITIONAL(DOC, test "${enable_doc}" != "no" -a "$SPHINXBUILD" != "/bin/false") AM_CONDITIONAL(DOC_HTML, test "${enable_doc_html}" = "yes") dnl -------------------- @@ -2077,6 +2082,6 @@ The above user and group must have read/write access to the state file directory and to the config files in the config file directory." if test "${enable_doc}" != "no";then - AS_IF([test "x$SPHINXBUILD" = xno], + AS_IF([test "$SPHINXBUILD" = /bin/false], AC_MSG_WARN(sphinx-build is missing but required to build documentation)) fi |