sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autotools: Remove useless code

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m4/geany-docutils.m4
View File

@ -33,8 +33,7 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML],
AS_IF([test "x$geany_enable_html_docs" != "xno"], AS_IF([test "x$geany_enable_html_docs" != "xno"],
[ [
dnl TODO: try rst2html.py first 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"], 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"],
@ -62,8 +61,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"],
[ [
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"], 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"],

4
m4/geany-doxygen.m4
View File

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