@@ -115,7 +115,6 @@ EXTRA_DIST += $(DOC_SOURCE)
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
SPHINXSRCDIR = $(srcdir)/Documentation
SPHINXBUILDDIR = $(builddir)/Documentation/_build
@@ -474,15 +474,10 @@ AC_DEFUN([OVS_CHECK_FLAKE8],
dnl Checks for sphinx.
AC_DEFUN([OVS_CHECK_SPHINX],
- [AC_CACHE_CHECK(
- [for sphinx],
- [ovs_cv_sphinx],
- [if type sphinx-build >/dev/null 2>&1; then
- ovs_cv_sphinx=yes
- else
- ovs_cv_sphinx=no
- fi])
- AM_CONDITIONAL([HAVE_SPHINX], [test "$ovs_cv_sphinx" = yes])])
+ [AC_CHECK_PROGS(
+ [SPHINXBUILD], [sphinx-build-3 sphinx-build-2 sphinx-build], [none])
+ AC_ARG_VAR([SPHINXBUILD])
+ AM_CONDITIONAL([HAVE_SPHINX], [test "$ac_cv_prog_SPHINXBUILD" != none])])
dnl Checks for dot.
AC_DEFUN([OVS_CHECK_DOT],
There's nothing in OVS specific to Sphinx for Python 2, but the compile-time check only looked for a binary named "sphinx-build", which is typically provided only for Python 2. With Python 3, the binary is typically called "sphinx-build-3". With this commit, either name is accepted. Signed-off-by: Ben Pfaff <blp@ovn.org> --- Documentation/automake.mk | 1 - m4/openvswitch.m4 | 13 ++++--------- 2 files changed, 4 insertions(+), 10 deletions(-)