| Message ID | 1489060524-12793-1-git-send-email-i.maximets@samsung.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Mar 09, 2017 at 02:55:24PM +0300, Ilya Maximets wrote: > Sphinx 1.1.3 on RHEL7 is able to properly build the documentation. > > Discovering fixed because 'sphinx-build v1.1.3' doesn't support > '--version' option. > > Acked-by: Stephen Finucane <stephen@that.guru> > Signed-off-by: Ilya Maximets <i.maximets@samsung.com> > --- > Version 2: > * Changes to 'Documentation/intro/install/windows.rst' > dropped because of existing similar patch from Darren Ball: > https://patchwork.ozlabs.org/patch/734930/ Applied to master, thanks!
diff --git a/Documentation/conf.py b/Documentation/conf.py index 389ef70..5909669 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -30,7 +30,7 @@ except ImportError: # If your documentation needs a minimal Sphinx version, state it here. # -needs_sphinx = '1.2' +needs_sphinx = '1.1' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom diff --git a/Documentation/requirements.txt b/Documentation/requirements.txt index fcc02fd..77130c6 100644 --- a/Documentation/requirements.txt +++ b/Documentation/requirements.txt @@ -1,2 +1,2 @@ -sphinx>=1.2,<2.0 +sphinx>=1.1,<2.0 ovs_sphinx_theme>=1.0,<1.1 diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 07c6191..0b2cc27 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -417,7 +417,7 @@ AC_DEFUN([OVS_CHECK_SPHINX], [AC_CACHE_CHECK( [for sphinx], [ovs_cv_sphinx], - [if sphinx-build --version >/dev/null 2>&1; then + [if type sphinx-build >/dev/null 2>&1; then ovs_cv_sphinx=yes else ovs_cv_sphinx=no