The regular expression used for parsing the Sphinx version does not work with Sphinx versions after 1.1, as reported in issue #502. The reason for this is that upstream commit 8f28af8e2ed8[1] introduced proper support for --version, which ganeti was already using but sphinx-build was lacking (outputting generic usage information instead).
Since it seems that upstream has no reason to change the output format again, we support the new versioning scheme with a strict-as-possible match. This fixes issue 502. [1] https://bitbucket.org/birkenfeld/sphinx/commits/8f28af8e2ed8619087738d83b4f55e3db938a104 Signed-off-by: Apollon Oikonomopoulos <[email protected]> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 266927f..fce60b1 100644 --- a/configure.ac +++ b/configure.ac @@ -355,7 +355,7 @@ else # Note: Character classes ([...]) need to be double quoted due to autoconf # using m4 - elif ! echo "$sphinxver" | grep -q -E '^Sphinx[[[:space:]]]+v[[1-9]]\>'; then + elif ! echo "$sphinxver" | grep -q -E '^Sphinx[[[:space:]]]+(\(sphinx-build\)[[[:space:]]]+|v)[[1-9]]\>'; then AC_MSG_ERROR([Sphinx 1.0 or higher is required]) fi fi -- 1.8.5.2
