Conflict with Jun T's texi2any patch

[Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx>]

This must be something I had left unposted -- I added "makeinfo" fallbacks:

++<<<<<<< HEAD
 +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [makeinfo --pdf])
 +AC_CHECK_PROGS([TEXI2HTML], [texi2html], [makeinfo --html])
++=======
+ AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
+ AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html])
+ 
+ if test x"$TEXI2HTML" = xtexi2any; then
+   TEXI2HTML='texi2any -c TEXI2HTML=1'
+ fi
+ 
++>>>>>>> master


I presume texi2any can replace texi2pdf as well, if that's not found?