From: Howard Chu <hyc@openldap.org>
Date: Mon, 11 Feb 2002 09:39:15 +0000 (+0000)
Subject: Fix #include of sasl.h
X-Git-Tag: OPENLDAP_REL_ENG_2_1_BP~50
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a916535a2793a11b68eb5a62b09f1e3adf6610e7;p=openldap

Fix #include of sasl.h
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 9d8bdb32c2..8981598ae0 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -23,7 +23,7 @@
 ldap_pvt_thread_mutex_t ldap_int_sasl_mutex;
 #endif
 
-#ifdef HAVE_HEADER_SASL_SASL_H
+#ifdef HAVE_SASL_SASL_H
 #include <sasl/sasl.h>
 #else
 #include <sasl.h>
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index f9ca6aee59..2b9df3da60 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_CYRUS_SASL
 	/* the need for this should be removed */
-#ifdef HAVE_HEADER_SASL_SASL_H
+#ifdef HAVE_SASL_SASL_H
 #include <sasl/sasl.h>
 #else
 #include <sasl.h>
diff --git a/libraries/liblutil/sasl.c b/libraries/liblutil/sasl.c
index 4ca35e054e..3f330ab1dd 100644
--- a/libraries/liblutil/sasl.c
+++ b/libraries/liblutil/sasl.c
@@ -13,7 +13,11 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #include <ldap.h>
 #include "lutil_ldap.h"