← Back to branch summary

~mordred/debian/sid/pandora-build/upstream-update

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Monty Taylor
  • Date: 2010-10-08 17:29:39 UTC
  • mfrom: (68.1.175 pandora-build)
  • Revision ID: mordred@inaugust.com-20101008172939-b1vsdlxj3oatcdg1
Merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_canonical.m4
4
4
dnl with or without modifications, as long as this notice is preserved.
5
5
 
6
6
dnl Which version of the canonical setup we're using
7
 
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.156])
 
7
AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.157])
8
8
 
9
9
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
10
10
  AC_ARG_ENABLE([fat-binaries],
233
233
  AC_CHECK_PROGS([DOXYGEN], [doxygen])
234
234
  AC_CHECK_PROGS([PERL], [perl])
235
235
  AC_CHECK_PROGS([DPKG_GENSYMBOLS], [dpkg-gensymbols], [:])
 
236
  AC_CHECK_PROGS([LCOV], [lcov], [echo lcov not found])
 
237
  AC_CHECK_PROGS([LCOV_GENHTML], [genhtml], [echo genhtml not found])
 
238
 
236
239
  AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build], [:])
237
240
  AS_IF([test "x${SPHINXBUILD}" != "x:"],[
238
241
    AC_CACHE_CHECK([if sphinx is new enough],[ac_cv_recent_sphinx],[
248
251
  AM_CONDITIONAL(HAVE_SPHINX,[test "x${SPHINXBUILD}" != "x:"])
249
252
  AM_CONDITIONAL(HAVE_RECENT_SPHINX,[test "x${ac_cv_recent_sphinx}" = "xyes"])
250
253
 
 
254
  PANDORA_REQUIRE_BISON
 
255
  PANDORA_REQUIRE_FLEX
 
256
 
251
257
  m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [
252
258
    AM_PO_SUBDIRS
253
259
    IT_PROG_INTLTOOL([0.35],[no-xml])