doc: Decrease build requirements to support RHEL7.

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 <[email protected]> Signed-off-by: Ilya Maximets <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
cechu66 · Mar 17, 2017 · 59cf52e · 59cf52e
1 parent 23cb93f
commit 59cf52e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Documentation/conf.py b/Documentation/conf.py
@@ -30,7 +30,7 @@
 
 # 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
@@ -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
@@ -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