Skip to content

Commit

Permalink
autotools: Check for docutils tools with a .py suffix too
Browse files Browse the repository at this point in the history
Docutils tools are apparently installed with an extension suffix by
default, so check for this too.

Closes #424.
  • Loading branch information
b4n committed Feb 20, 2015
1 parent ea79be3 commit 91630a8
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions m4/geany-docutils.m4
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down

0 comments on commit 91630a8

Please sign in to comment.