Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 988c2a5..80344e6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -397,7 +397,8 @@ 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