From 65a9b9469223621c510a51beb4dbec18f12475ae Mon Sep 17 00:00:00 2001 From: Stuart Henderson Date: Wed, 17 Apr 2013 23:32:17 -0600 Subject: [PATCH] Bug 3822: Locate LDAP and SASL headers in /usr/local/include for BSD support --- helpers/basic_auth/LDAP/config.test | 2 +- helpers/basic_auth/SASL/config.test | 4 ++-- helpers/digest_auth/LDAP/config.test | 2 +- helpers/digest_auth/eDirectory/config.test | 2 +- helpers/external_acl/LDAP_group/config.test | 2 +- helpers/external_acl/eDirectory_userip/config.test | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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 -- 2.47.2