Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 20 Feb 2015 21:30:58 UTC Commit: 91630a85a2f6c25b0101efa0ab6d3e436455966a https://github.com/geany/geany/commit/91630a85a2f6c25b0101efa0ab6d3e43645596...

Log Message: ----------- autotools: Check for docutils tools with a `.py` suffix too

Docutils tools are apparently installed with an extension suffix by default, so check for this too.

Closes #424.

Modified Paths: -------------- m4/geany-docutils.m4

Modified: m4/geany-docutils.m4 5 lines changed, 2 insertions(+), 3 deletions(-) =================================================================== @@ -32,8 +32,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML], AC_ARG_VAR([RST2HTML], [Path to Docutils rst2html executable]) AS_IF([test "x$geany_enable_html_docs" != "xno"], [ -dnl TODO: try rst2html.py first - AC_PATH_PROG([RST2HTML], [rst2html], [no]) + AC_PATH_PROGS([RST2HTML], [rst2html rst2html.py], [no]) AS_IF([test "x$RST2HTML" != "xno"], [geany_enable_html_docs="yes"], [test "x$geany_enable_html_docs" = "xyes"], @@ -61,7 +60,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_PDF], AC_ARG_VAR([RST2PDF], [Path to Docutils rst2pdf executable]) AS_IF([test "x$geany_enable_pdf_docs" != "xno"], [ - AC_PATH_PROG([RST2PDF], [rst2pdf], [no]) + AC_PATH_PROGS([RST2PDF], [rst2pdf rst2pdf.py], [no]) AS_IF([test "x$RST2PDF" != "xno"], [geany_enable_pdf_docs="yes"], [test "x$geany_enable_pdf_docs" = "xyes"],

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).