m4: fix output of sphinx-build version check

[awesomized/libmemcached] / m4 / ax_prog_sphinx_build.m4

diff --git a/m4/ax_prog_sphinx_build.m4 b/m4/ax_prog_sphinx_build.m4
index 3a89a3316b631cb655c55f381795eabd3c0b5699..ff64650b93014c25effed02aaf56eb7ddf3f32be 100644 (file)
--- a/m4/ax_prog_sphinx_build.m4
+++ b/m4/ax_prog_sphinx_build.m4
@@ -19,26 +19,30 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 3
+#serial 6
 
 AC_DEFUN([AX_PROG_SPHINX_BUILD],
-    [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:])
-    AS_IF([test x"SPHINXBUILD" = x":"],
-      [SPHINXBUILD=],
-      [AS_IF([test -x "$SPHINXBUILD"],
-        [AC_MSG_CHECKING([Checking to see if $SPHINXBUILD is recent])
-        junk=`$SPHINXBUILD &> version_file`
-        ax_sphinx_build_version=`head -1 version_file`
-        rm version_file
-        AC_MSG_RESULT([$SPHINXBUILD is version "$ax_sphinx_build_version"])
-        $SPHINXBUILD -Q -C -b man -d conftest.d . . >/dev/null 2>&1
-        AS_IF([test $? -eq 0], ,[SPHINXBUILD=])
-        rm -rf conftest.d
-        ])
-      ])
+         [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:])
+         AS_IF([test x"SPHINXBUILD" = x":"],
+               [SPHINXBUILD=],
+               [AS_IF([test -x "$SPHINXBUILD"],
+                      [AC_MSG_CHECKING([Checking to see if $SPHINXBUILD is recent])
+                      junk=`$SPHINXBUILD --version &> version_file`
+                      AS_IF([test $? -eq 0],
+                            [ax_sphinx_build_version=`head -1 version_file`],
+                            [junk=`$SPHINXBUILD &> version_file`
+                            ax_sphinx_build_version=`head -1 version_file`
+                            rm version_file
+                            $SPHINXBUILD -Q -C -b man -d conftest.d . . >/dev/null 2>&1
+                            AS_IF([test $? -eq 0], ,[SPHINXBUILD=])
+                            rm -rf conftest.d ])
+                      ])
+                      rm -f version_file
+                      AC_MSG_RESULT(["$ax_sphinx_build_version"])
+               ])
 
-    AS_IF([test -n "${SPHINXBUILD}"],
-      [AC_SUBST([SPHINXBUILD])
-      ifelse([$1], , :, [$1])],
-      [ifelse([$2], , :, [$2])])
-    ])
+         AS_IF([test -n "${SPHINXBUILD}"],
+               [AC_SUBST([SPHINXBUILD])
+               ifelse([$1], , :, [$1])],
+               [ifelse([$2], , :, [$2])])
+         ])