From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Conflict with Jun T's texi2any patch
Date: Fri, 22 May 2015 10:05:46 -0700 [thread overview]
Message-ID: <150522100546.ZM25066@torch.brasslantern.com> (raw)
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?
next reply other threads:[~2015-05-22 17:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-22 17:05 Bart Schaefer [this message]
2015-05-22 21:27 ` Peter Stephenson
2015-05-23 10:13 ` Daniel Shahaf
2015-05-23 16:47 ` Jun T.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=150522100546.ZM25066@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).