Kaydet (Commit) 91630a85 authored tarafından Colomban Wendling's avatar Colomban Wendling

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.
üst ea79be32
...@@ -32,8 +32,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML], ...@@ -32,8 +32,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML],
AC_ARG_VAR([RST2HTML], [Path to Docutils rst2html executable]) AC_ARG_VAR([RST2HTML], [Path to Docutils rst2html executable])
AS_IF([test "x$geany_enable_html_docs" != "xno"], AS_IF([test "x$geany_enable_html_docs" != "xno"],
[ [
dnl TODO: try rst2html.py first AC_PATH_PROGS([RST2HTML], [rst2html rst2html.py], [no])
AC_PATH_PROG([RST2HTML], [rst2html], [no])
AS_IF([test "x$RST2HTML" != "xno"], AS_IF([test "x$RST2HTML" != "xno"],
[geany_enable_html_docs="yes"], [geany_enable_html_docs="yes"],
[test "x$geany_enable_html_docs" = "xyes"], [test "x$geany_enable_html_docs" = "xyes"],
...@@ -61,7 +60,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_PDF], ...@@ -61,7 +60,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_PDF],
AC_ARG_VAR([RST2PDF], [Path to Docutils rst2pdf executable]) AC_ARG_VAR([RST2PDF], [Path to Docutils rst2pdf executable])
AS_IF([test "x$geany_enable_pdf_docs" != "xno"], 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"], AS_IF([test "x$RST2PDF" != "xno"],
[geany_enable_pdf_docs="yes"], [geany_enable_pdf_docs="yes"],
[test "x$geany_enable_pdf_docs" = "xyes"], [test "x$geany_enable_pdf_docs" = "xyes"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment