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 5c354f8b354439308e41056ce85dde0285cfa392..4326b7c931d88c8fd42cd01f347e914789d3dbdf 100755 (executable)
--- 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 8054c9555ab5bd9e087b091de8fa23b74430fdbc..871e27876a3d77c3de9605c7a8e2b47d4b0d9383 100755 (executable)
--- 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 5c354f8b354439308e41056ce85dde0285cfa392..4326b7c931d88c8fd42cd01f347e914789d3dbdf 100755 (executable)
--- 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 5c354f8b354439308e41056ce85dde0285cfa392..4326b7c931d88c8fd42cd01f347e914789d3dbdf 100755 (executable)
--- 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 5c354f8b354439308e41056ce85dde0285cfa392..4326b7c931d88c8fd42cd01f347e914789d3dbdf 100755 (executable)
--- 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 8f83d3905dab18a17677a025028bc5d1127f830a..accfd32d9cb89c951c6538f188e5f1919b722218 100644 (file)
--- 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