Add additional search names for docbook texi conversion program.

On Arch, it is called docbook2text

diff --git a/configure.ac b/configure.ac
index 892de59fc33fa9426b9288c7c5d3b3d67f22db9d..b07fade053c1dec86e5403ba8789f63ea4bcf0cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1562,14 +1562,16 @@ then
 fi
 AC_SUBST(DSLROOT)
 
-AC_PATH_PROG([db2x], [docbook2x-texi], [none])
-if test "$db2x" != "none"; then
-   AC_PATH_PROG([makeinfo], [makeinfo], [none])
-   if test "$makeinfo" != "none"; then
+AC_PATH_PROGS([DB2XTEXI], [docbook2x-texi docbook2texi], [none])
+if test "$DB2XTEXI" != "none"; then
+   AC_PATH_PROG([MAKEINFO], [makeinfo], [none])
+   if test "$MAKEINFO" != "none"; then
       do_build_info=yes
    fi
 fi
 AM_CONDITIONAL(BUILD_INFO, test x$do_build_info = xyes)
+AC_SUBST(DB2XTEXI)
+AC_SUBST(MAKEINFO)
 
 AC_ARG_ENABLE(doc, AS_HELP_STRING([--disable-doc],[Do not build the documentation]),
 [       if test x$enableval = xno ; then

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5d180c93c6f611401af6c6fb121fe566213836bd..da07c66f79bebf4afb72cb99e03bea165b5dd68e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -161,14 +161,14 @@ manual.tex: stamp-doc-xml
        fi
 
 mutt.texi: stamp-doc-xml
-       docbook2x-texi --encoding=utf-8 \
+       $(DB2XTEXI) --encoding=utf-8 \
            --string-param output-file=mutt \
            --string-param 'directory-category=Email-software' \
            --string-param 'directory-description=Text based mail reader' \
            manual.xml
 
 mutt.info: mutt.texi
-       makeinfo --no-split -o mutt.info mutt.texi
+       $(MAKEINFO) --no-split -o mutt.info mutt.texi
 
 validate: stamp-doc-xml
        xmllint --noout --noblanks --postvalid manual.xml