autotools: Remove useless code

AC_PATH_PROG supports overrides of its variable, so there is no need
for manual handling.
This commit is contained in:
Colomban Wendling 2015-02-20 22:28:26 +01:00
parent b87254e1b3
commit ea79be32f2
2 changed files with 3 additions and 7 deletions

View File

@ -33,8 +33,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML],
AS_IF([test "x$geany_enable_html_docs" != "xno"],
[
dnl TODO: try rst2html.py first
AS_IF([test -z "$RST2HTML"], [RST2HTML="rst2html"])
AC_PATH_PROG([RST2HTML], [$RST2HTML], [no])
AC_PATH_PROG([RST2HTML], [rst2html], [no])
AS_IF([test "x$RST2HTML" != "xno"],
[geany_enable_html_docs="yes"],
[test "x$geany_enable_html_docs" = "xyes"],
@ -62,8 +61,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"],
[
AS_IF([test -z "$RST2PDF"], [RST2PDF="rst2pdf"])
AC_PATH_PROG([RST2PDF], [$RST2PDF], [no])
AC_PATH_PROG([RST2PDF], [rst2pdf], [no])
AS_IF([test "x$RST2PDF" != "xno"],
[geany_enable_pdf_docs="yes"],
[test "x$geany_enable_pdf_docs" = "xyes"],

View File

@ -13,9 +13,7 @@ AC_DEFUN([GEANY_CHECK_DOXYGEN],
AS_IF([test "x$geany_with_doxygen" != "xno"],
[
AS_IF([test "x$DOXYGEN" != "x"],
[geany_doxygen_path="$DOXYGEN"], [geany_doxygen_path="doxygen"])
AC_PATH_PROG([DOXYGEN], [$geany_doxygen_path], [no])
AC_PATH_PROG([DOXYGEN], [doxygen], [no])
AS_IF([test "x$DOXYGEN" != "xno"],
[geany_with_doxygen=yes],
[test "x$geany_with_doxygen" = xyes],