Fix #include of sasl.h

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 9d8bdb32c24ca59da5fc1f001c0fd8045f556877..8981598ae0d90f36ba9e1cd8b668ddf4e5c7fd6a 100644 (file)
--- 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 f9ca6aee593c79402dcb1ce4bdd9e340228a1a23..2b9df3da604843911f2099f515a15de50f210b9b 100644 (file)
--- 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 4ca35e054e1945c216387eb886d2b3ed72f81060..3f330ab1ddb5afdebaa15a818a1f0fca643c99d8 100644 (file)
--- 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"