From a5592491e96f0dbb3198b70fc2636ba655a08242 Mon Sep 17 00:00:00 2001
From: Daniel Maxwell <com@dmaxwell.co.uk>
Date: Tue, 24 Mar 2015 13:21:22 +0000
Subject: [PATCH] Check presence of advpng and jpegtran executables

For unix and windows we have defined the jpegtran.executable and advpng.executable locations, so to find out if we have them we have to check that variable, not the ENV.PATH variable.
---
 build.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 91ca58d..60477f8 100644
--- a/build.xml
+++ b/build.xml
@@ -1132,9 +1132,14 @@
             </then>
         </if>    
         <if>
-          <not>
-             <available file="advpng" filepath="${ENV.PATH}"/>
-          </not>
+            <and>
+                <not>
+                    <available file="advpng" filepath="${ENV.PATH}"/>
+                </not>
+                <not>
+                    <available file="${advpng.executable}"/>
+                </not>
+            </and>
           <then>
             <var name="advpng.available" value="false"/>
           </then>
@@ -1205,10 +1210,14 @@
             </then>
         </if>    
         <if>
-          <not>
-            <available file="jpegtran" filepath="${ENV.PATH}"/>
-          </not>
-           
+            <and>
+                <not>
+                    <available file="jpegtran" filepath="${ENV.PATH}"/>
+                </not>
+                <not>
+                    <available file="${jpegtran.executable}"/>
+                </not>
+            </and>
           <then>
             <var name="jpegtran.available" value="false"/>
           </then>