mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

Documentation: Work with sphinx-build for Python 3 also.

Browse Source 
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.

Acked-by: Numan Siddique <nusididq@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Ben Pfaff 2019-09-16 11:56:59 -07:00
parent c98f69070a
commit 2a97891eb2
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/automake.mk
View File

@ -115,7 +115,6 @@ EXTRA_DIST += $(DOC_SOURCE)
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXSRCDIR = $(srcdir)/Documentation SPHINXSRCDIR = $(srcdir)/Documentation
SPHINXBUILDDIR = $(builddir)/Documentation/_build SPHINXBUILDDIR = $(builddir)/Documentation/_build

13
m4/openvswitch.m4
View File

@ -474,15 +474,10 @@ AC_DEFUN([OVS_CHECK_FLAKE8],
dnl Checks for sphinx. dnl Checks for sphinx.
AC_DEFUN([OVS_CHECK_SPHINX], AC_DEFUN([OVS_CHECK_SPHINX],
[AC_CACHE_CHECK( [AC_CHECK_PROGS(
[for sphinx], [SPHINXBUILD], [sphinx-build-3 sphinx-build-2 sphinx-build], [none])
[ovs_cv_sphinx], AC_ARG_VAR([SPHINXBUILD])
[if type sphinx-build >/dev/null 2>&1; then AM_CONDITIONAL([HAVE_SPHINX], [test "$ac_cv_prog_SPHINXBUILD" != none])])
ovs_cv_sphinx=yes
else
ovs_cv_sphinx=no
fi])
AM_CONDITIONAL([HAVE_SPHINX], [test "$ovs_cv_sphinx" = yes])])
dnl Checks for dot. dnl Checks for dot.
AC_DEFUN([OVS_CHECK_DOT], AC_DEFUN([OVS_CHECK_DOT],