From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 23 Mar 2010 15:45:39 +0000 (+0100)
Subject: Improved helper configlets for wider compatibility.
X-Git-Tag: SQUID_3_2_0_1~331
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4609a113fa48709be05e4a5218c58d7a681426f3;p=thirdparty%2Fsquid.git

Improved helper configlets for wider compatibility.
---

diff --git a/helpers/basic_auth/DB/config.test b/helpers/basic_auth/DB/config.test
index 9b1b1dfc5a..387b7b1185 100755
--- a/helpers/basic_auth/DB/config.test
+++ b/helpers/basic_auth/DB/config.test
@@ -2,6 +2,6 @@
 
 ## Test: do we have perl to build the helper scripts?
 ## Test: do we have pod2man to build the manual?
-perl --version >/dev/null && pod2man --help >/dev/null
+perl --version >/dev/null && echo | pod2man >/dev/null
 
 exit $?
diff --git a/helpers/basic_auth/RADIUS/config.test b/helpers/basic_auth/RADIUS/config.test
old mode 100644
new mode 100755
diff --git a/helpers/external_acl/wbinfo_group/config.test b/helpers/external_acl/wbinfo_group/config.test
index b9af8921e5..fdaf038639 100755
--- a/helpers/external_acl/wbinfo_group/config.test
+++ b/helpers/external_acl/wbinfo_group/config.test
@@ -1,8 +1,12 @@
 #!/bin/sh
-if [ -x ${SAMBAPREFIX:-/usr/local/samba}/bin/wbinfo -a -x /usr/bin/perl ]; then
-	exit 0
-fi
-if [ -x /usr/bin/wbinfo -a -x /usr/bin/perl ]; then
-	exit 0
-fi
+
+for sambaprefix in ${SAMBAPREFIX} /usr/local /opt /opt/samba /usr/local/samba /usr
+do
+    for perlprefix in /usr /usr/local /opt /opt/perl
+    do
+        if [ -x $sambaprefix/bin/wbinfo -a -x $perlprefix/bin/perl ]; then
+            exit 0
+        fi
+    done
+done
 exit 1