Add makepack-awstats.pl script

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index 98a5678f09e2eb5dbe1af5997366d1b42b354e94..580c19722b0ba0a645a539b96a3f09773c4bcc48 100644 (file)
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -119,31 +119,32 @@ else {
     }\r
 }\r
 \r
-# Test if requirement is ok\r
-#--------------------------\r
-foreach my $target (keys %CHOOSEDTARGET) {\r
-    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {\r
-        # Test    \r
-        print "Test requirement for target $target: Search '$req'... ";\r
-        $ret1=`"$req" 2>&1`;\r
-        $coderetour=$?; $coderetour2=$coderetour>>8;\r
-        if ($coderetour != 0 && $coderetour2 == 1 && $PROGPATH) { \r
-            # If error not found, we try in PROGPATH\r
-            $ret2=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;\r
-            $coderetour=$?; $coderetour2=$coderetour>>8;\r
-            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";\r
-        }    \r
-\r
-        if ($coderetour == 0 || $coderetour2 > 1 || $ret1 =~ /Usage/im || $ret2 =~ /Usage/im) {\r
-            # Pas erreur ou erreur autre que programme absent\r
-            print " Found ".$REQUIREMENTTARGET{$target}."\n";\r
-        } else {\r
-            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";\r
-            $CHOOSEDTARGET{$target}=-1;\r
-            last;\r
-        }\r
-    }\r
-}\r
+# Test if requirement is ok
+#--------------------------
+foreach my $target (keys %CHOOSEDTARGET) {
+    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
+        # Test    
+        print "Test requirement for target $target: Search '$req'... ";
+        $ret=`"$req" 2>&1`;
+        $coderetour=$?; $coderetour2=$coderetour>>8;
+        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+            # Not found error, we try in PROGPATH
+            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+            $coderetour=$?; $coderetour2=$coderetour>>8;
+            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+        }    
+
+        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+            # Not found error
+            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+            $CHOOSEDTARGET{$target}=-1;
+            last;
+        } else {
+            # Pas erreur ou erreur autre que programme absent
+            print " Found ".$REQUIREMENTTARGET{$target}."\n";
+        }
+    }
+}
 \r
 print "\n";\r
 \r