Fix two valgrind finds.

[m6w6/libmemcached] / m4 / ax_prog_sphinx_build.m4

diff --git a/m4/ax_prog_sphinx_build.m4 b/m4/ax_prog_sphinx_build.m4
index 270067aa33b568544c567b3c2baf4a6b1b50ab44..3a89a3316b631cb655c55f381795eabd3c0b5699 100644 (file)
--- a/m4/ax_prog_sphinx_build.m4
+++ b/m4/ax_prog_sphinx_build.m4
@@ -22,22 +22,23 @@
 #serial 3
 
 AC_DEFUN([AX_PROG_SPHINX_BUILD],
-    [AC_PREREQ([2.63])dnl
-    AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build], [:])
-    AS_IF([test "x${SPHINXBUILD}" != "x:"],[
-      AC_CACHE_CHECK([if sphinx is new enough],[ac_cv_recent_sphinx],[
-
-        ${SPHINXBUILD} -Q -C -b man -d conftest.d . . >/dev/null 2>&1
-        AS_IF([test $? -eq 0],[ac_cv_recent_sphinx=yes],
-          [ac_cv_recent_sphinx=no])
+    [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
         ])
       ])
 
-    AM_CONDITIONAL([HAVE_SPHINX],[test "x${SPHINXBUILD}" != "x:"])
-    AM_CONDITIONAL([HAVE_RECENT_SPHINX],[test "x${ac_cv_recent_sphinx}" = "xyes"])
-
-    AS_IF([test "x${ac_cv_recent_sphinx}" = "xyes"],
-        [ifelse([$2], , :, [$2])],
-        [ifelse([$3], , :, [$3])])
-])
+    AS_IF([test -n "${SPHINXBUILD}"],
+      [AC_SUBST([SPHINXBUILD])
+      ifelse([$1], , :, [$1])],
+      [ifelse([$2], , :, [$2])])
+    ])