← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_canonical.m4

  • Committer: Monty Taylor
  • Date: 2010-09-29 03:02:38 UTC
  • mfrom: (1800.2.1 fix-sphinx-testing)
  • mto: This revision was merged to the branch mainline in revision 1801.
  • Revision ID: mordred@inaugust.com-20100929030238-24dwor9tok6i32nx
Fixed sphinx version testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_canonical.m4
234
234
  AC_CHECK_PROGS([PERL], [perl])
235
235
  AC_CHECK_PROGS([DPKG_GENSYMBOLS], [dpkg-gensymbols], [:])
236
236
  AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build], [:])
 
237
  AS_IF([test "x${SPHINXBUILD}" != "x:"],[
 
238
    AC_CACHE_CHECK([if sphinx is new enough],[ac_cv_recent_sphinx],[
 
239
    
 
240
    ${SPHINXBUILD} -Q -C -b man -d conftest.d . . >/dev/null 2>&1
 
241
    AS_IF([test $? -eq 0],[ac_cv_recent_sphinx=yes],
 
242
          [ac_cv_recent_sphinx=no])
 
243
    rm -rf conftest.d
 
244
    ])
 
245
  ])
237
246
 
238
247
  AM_CONDITIONAL(HAVE_DPKG_GENSYMBOLS,[test "x${DPKG_GENSYMBOLS}" != "x:"])
239
248
  AM_CONDITIONAL(HAVE_SPHINX,[test "x${SPHINXBUILD}" != "x:"])
 
249
  AM_CONDITIONAL(HAVE_RECENT_SPHINX,[test "x${ac_cv_recent_sphinx}" != "xno"])
240
250
 
241
251
  m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [
242
252
    AM_PO_SUBDIRS