diff options
| -rw-r--r-- | Documentation/automake.mk | 1 | ||||
| -rw-r--r-- | m4/openvswitch.m4 | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Documentation/automake.mk b/Documentation/automake.mk index cd68f3b15..e1384851d 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -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 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], |