X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fax_prog_sphinx_build.m4;h=270067aa33b568544c567b3c2baf4a6b1b50ab44;hb=a909573e5e57f8a6ee92cf4ffb031b9762642d1b;hp=8b69df83c01391cd3c77cf1d0d919eb4bcb4f209;hpb=386280f69a9b5050751a88addb42568e09efb44b;p=m6w6%2Flibmemcached

diff --git a/m4/ax_prog_sphinx_build.m4 b/m4/ax_prog_sphinx_build.m4
index 8b69df83..270067aa 100644
--- a/m4/ax_prog_sphinx_build.m4
+++ b/m4/ax_prog_sphinx_build.m4
@@ -4,30 +4,25 @@
 #
 # SYNOPSIS
 #
-#   AX_PROG_SPHINX_BUILD()
+#   AX_PROG_SPHINX_BUILD([ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND])
 #
 # DESCRIPTION
 #
-#   Look for sphinx-build
+#   Look for sphinx-build and make sure it is a recent version of it.
 #
 # LICENSE
 #
-#   Copyright (c) 2012 Brian Aker <brian@tangent.org>
+#   Copyright (c) 2012-2013 Brian Aker <brian@tangent.org>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 2
+#serial 3
 
 AC_DEFUN([AX_PROG_SPHINX_BUILD],
     [AC_PREREQ([2.63])dnl
-    AC_CHECK_PROGS([PERL], [perl])
-    AC_CHECK_PROGS([DPKG_GENSYMBOLS], [dpkg-gensymbols], [:])
-    AC_CHECK_PROGS([LCOV], [lcov], [echo lcov not found])
-    AC_CHECK_PROGS([LCOV_GENHTML], [genhtml], [echo genhtml not found])
-
     AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build], [:])
     AS_IF([test "x${SPHINXBUILD}" != "x:"],[
       AC_CACHE_CHECK([if sphinx is new enough],[ac_cv_recent_sphinx],[
@@ -39,7 +34,10 @@ AC_DEFUN([AX_PROG_SPHINX_BUILD],
         ])
       ])
 
-    AM_CONDITIONAL(HAVE_DPKG_GENSYMBOLS,[test "x${DPKG_GENSYMBOLS}" != "x:"])
-    AM_CONDITIONAL(HAVE_SPHINX,[test "x${SPHINXBUILD}" != "x:"])
-    AM_CONDITIONAL(HAVE_RECENT_SPHINX,[test "x${ac_cv_recent_sphinx}" = "xyes"])
+    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])])
 ])