From a7ac992b12325c9771ef9baa5543c1e7ac2121d4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 27 Nov 2001 22:37:25 +0000
Subject: added test for krb5.h

this was causing the kerberos stuff to fail compilation on several
platforms
(This used to be commit 17e2f3897374c76dd66b21fdcd93c3a04671f4ce)
---
 source3/include/config.h.in | 3 +++
 source3/include/includes.h  | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'source3/include')

diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 6280c793eb..92b726c45c 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -820,6 +820,9 @@
 /* Define if you have the <history.h> header file.  */
 #undef HAVE_HISTORY_H
 
+/* Define if you have the <krb5.h> header file.  */
+#undef HAVE_KRB5_H
+
 /* Define if you have the <lastlog.h> header file.  */
 #undef HAVE_LASTLOG_H
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0a3fd1f4c0..0ebc09b450 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -379,18 +379,25 @@
 
 #if HAVE_KRB5_H
 #include <krb5.h>
+#else
+#undef HAVE_KRB5
 #endif
 
 #if HAVE_LDAP_H
 #include <ldap.h>
+#else
+#undef HAVE_LDAP
 #endif
 
 #if HAVE_SASL_H
 #include <sasl.h>
+#else
+/* we must have sasl to use ldap */
+#undef HAVE_LDAP
 #endif
 
 /* we support ADS if we have krb5 and ldap libs */
-#if defined(HAVE_KRB5) && defined(HAVE_KRB5_H) && defined(HAVE_LDAP) && defined(HAVE_LDAP_H) && defined(HAVE_SASL_H)
+#if defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS
 #endif
 
-- 
cgit