diff options
| author | Ben Pfaff <blp@ovn.org> | 2019-09-16 11:56:59 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-09-20 08:34:29 -0700 |
| commit | 2a97891eb23b04ceb513ca7a860aafe91fe1555f (patch) | |
| tree | 25044f3f470df4e5ccfc234ce83846d9ce5a92ed /m4 | |
| parent | c98f69070ab11a54fb7018e65905f769f3b1f676 (diff) | |
| download | openvswitch-2a97891eb23b04ceb513ca7a860aafe91fe1555f.tar.gz | |
Documentation: Work with sphinx-build for Python 3 also.
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>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index cd6b51d86..4379d16b4 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -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], |