From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35264-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 26366 invoked by alias); 22 May 2015 17:05:56 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 35264
Received: (qmail 1440 invoked from network); 22 May 2015 17:05:53 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW,
	RCVD_IN_MSPIKE_H2 autolearn=ham autolearn_force=no version=3.4.0
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:from:message-id:date:to:subject:mime-version
         :content-type;
        bh=DNIxPSSPgTAcmZhgwwy80a+U9S3yA9fc0ibnhyaIDT0=;
        b=T5DjidTZi5yH5gkelnnJklAsWdFNd71Hk/U+p5ba9MKPVn4S37l7Hh7UgCxxajWW/E
         LqteveChQhlC4dS/Fma1EDJ+i5pz+uUCYBxbs4Cc4XdiuNeIMXAW1cWa8nwl1mA2ZwLD
         kHmDHpPHilKlHkxib2nUW9U8IBamqYWWGOXrgCzi9jLki06DAdJzMT4W2KaJ5deK7Ytu
         +tvF7wkabX22pl/4rY7U6iGpD0OnTJEsu7UXDFiin46Dzt7KRK8E8XDuFNa5asyT+Bg/
         5F3r8Rlyp/Dc88sRqWvcsz5mOxMhgnGc5MR4c9K8TYE5Z+eJXuTYu04SrkotbN5ZnAp+
         +jbg==
X-Gm-Message-State: ALoCoQljpfh/qvOC146uNqylxim30kKyTp9QzF6oFsFZIl8PXCnRBepzTSKltlxfXcIWGeoCZZhm
X-Received: by 10.182.86.39 with SMTP id m7mr7529750obz.18.1432314350313;
        Fri, 22 May 2015 10:05:50 -0700 (PDT)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-Id: <150522100546.ZM25066@torch.brasslantern.com>
Date: Fri, 22 May 2015 10:05:46 -0700
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh-workers@zsh.org
Subject: Conflict with Jun T's texi2any patch
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

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?