From: Stuart Henderson <sthen@openbsd.org>
Date: Tue, 16 Apr 2013 13:06:01 +0000 (-0600)
Subject: Bug 3822: Locate LDAP and SASL headers in /usr/local/include for BSD support
X-Git-Tag: SQUID_3_4_0_1~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f189884b0c000a13f90df8505725b98ff412f55;p=thirdparty%2Fsquid.git

Bug 3822: Locate LDAP and SASL headers in /usr/local/include for BSD support
---

diff --git a/helpers/basic_auth/LDAP/config.test b/helpers/basic_auth/LDAP/config.test
index 5c354f8b35..4326b7c931 100755
--- a/helpers/basic_auth/LDAP/config.test
+++ b/helpers/basic_auth/LDAP/config.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then
diff --git a/helpers/basic_auth/SASL/config.test b/helpers/basic_auth/SASL/config.test
index 8054c9555a..871e27876a 100755
--- a/helpers/basic_auth/SASL/config.test
+++ b/helpers/basic_auth/SASL/config.test
@@ -1,8 +1,8 @@
 #!/bin/sh
-if [ -f /usr/include/sasl.h ]; then
+if [ -f /usr/include/sasl.h -o -f /usr/local/include/sasl.h ]; then
 	exit 0
 fi
-if [ -f /usr/include/sasl/sasl.h ]; then
+if [ -f /usr/include/sasl/sasl.h -o -f /usr/local/include/sasl/sasl.h ]; then
 	exit 0
 fi
 exit 1
diff --git a/helpers/digest_auth/LDAP/config.test b/helpers/digest_auth/LDAP/config.test
index 5c354f8b35..4326b7c931 100755
--- a/helpers/digest_auth/LDAP/config.test
+++ b/helpers/digest_auth/LDAP/config.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then
diff --git a/helpers/digest_auth/eDirectory/config.test b/helpers/digest_auth/eDirectory/config.test
index 5c354f8b35..4326b7c931 100755
--- a/helpers/digest_auth/eDirectory/config.test
+++ b/helpers/digest_auth/eDirectory/config.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then
diff --git a/helpers/external_acl/LDAP_group/config.test b/helpers/external_acl/LDAP_group/config.test
index 5c354f8b35..4326b7c931 100755
--- a/helpers/external_acl/LDAP_group/config.test
+++ b/helpers/external_acl/LDAP_group/config.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then
diff --git a/helpers/external_acl/eDirectory_userip/config.test b/helpers/external_acl/eDirectory_userip/config.test
index 8f83d3905d..accfd32d9c 100644
--- a/helpers/external_acl/eDirectory_userip/config.test
+++ b/helpers/external_acl/eDirectory_userip/config.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then