Update sphinx

diff --git a/configure.ac b/configure.ac
index 727ee722f7feaeeced84d54322f958bb1e85b4a8..2e3920cfcfbd23a59050fd548436cadd6e9ac554 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,13 +104,19 @@ PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED
 
 # Checks for programs.
-AC_PROG_AWK
-AC_PROG_SED
-AC_PROG_MKDIR_P
+AC_CHECK_PROGS([DPKG_GENSYMBOLS],[dpkg-gensymbols])
 AC_CHECK_PROGS([LEX],['flex'],[:])
+AC_CHECK_PROGS([PERL],[perl])
+AC_CHECK_PROGS([VALGRIND],['valgrind'])
+AC_CHECK_PROGS([WINE],['wine'])
 AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
-AX_PROG_SPHINX_BUILD(,[AC_MSG_ERROR([sphinx-build version 1.0 or greater is required])])
+AC_PROG_AWK
+AC_PROG_MKDIR_P
+AC_PROG_SED
 AX_PROG_MEMCACHED
+AX_PROG_SPHINX_BUILD(,[AC_MSG_ERROR([sphinx-build version 1.0 or greater is required])])
+AX_WITH_PROG([LCOV],[lcov])
+AX_WITH_PROG([LCOV_GENHTML],[genhtml])
 
 # Checks for libraries.
 AC_SEARCH_LIBS([getopt_long],[gnugetopt])

diff --git a/m4/ax_prog_sphinx_build.m4 b/m4/ax_prog_sphinx_build.m4
index 270067aa33b568544c567b3c2baf4a6b1b50ab44..2bbe57e2c453fe36c991c5427ee789a4ec1e34e7 100644 (file)
--- a/m4/ax_prog_sphinx_build.m4
+++ b/m4/ax_prog_sphinx_build.m4
@@ -22,22 +22,18 @@
 #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"],
+        [$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])])
+    ])