1 files changed, 24 insertions, 20 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 56b8357831..6084d583ed 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -216,15 +216,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-
-#ifdef HAVE_SYSLOG_H
 #include <syslog.h>
-#else
-#ifdef HAVE_SYS_SYSLOG_H
-#include <sys/syslog.h>
-#endif
-#endif
-
 #include <sys/file.h>
 
 #ifdef HAVE_NETINET_TCP_H
@@ -414,14 +406,18 @@
 
 #if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
+#else
+#undef HAVE_KRB5
 #endif
 
 #if HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
+#else
+#undef HAVE_KRB5
 #endif
 
-/* we support ADS if we want it and have krb5 and ldap libs */
-#if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
+/* we support ADS if we have krb5 and ldap libs */
+#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_GSSAPI)
 #define HAVE_ADS
 #endif
 
@@ -706,7 +702,6 @@ extern int errno;
 #include "../tdb/spinlock.h"
 #include "../tdb/tdbutil.h"
 #include "talloc.h"
-#include "nt_status.h"
 #include "ads.h"
 #include "interfaces.h"
 #include "hash.h"
@@ -752,8 +747,6 @@ extern int errno;
 
 #include "passdb.h"
 
-#include "sam.h"
-
 #include "session.h"
 
 #include "asn_1.h"
@@ -762,8 +755,6 @@ extern int errno;
 
 #include "mangle.h"
 
-#include "nsswitch/winbind_client.h"
-
 /*
  * Type for wide character dirent structure.
  * Only d_name is defined by POSIX.
@@ -803,11 +794,6 @@ struct functable {
 
 #include "nsswitch/nss.h"
 
-/* forward declaration from printing.h to get around 
-   header file dependencies */
-
-struct printjob;
-
 /***** automatically generated prototypes *****/
 #include "proto.h"
 
@@ -909,6 +895,24 @@ struct printjob;
 #define ULTRIX_AUTH 1
 #endif
 
+#ifdef HAVE_LIBREADLINE
+#  ifdef HAVE_READLINE_READLINE_H
+#    include <readline/readline.h>
+#    ifdef HAVE_READLINE_HISTORY_H
+#      include <readline/history.h>
+#    endif
+#  else
+#    ifdef HAVE_READLINE_H
+#      include <readline.h>
+#      ifdef HAVE_HISTORY_H
+#        include <history.h>
+#      endif
+#    else
+#      undef HAVE_LIBREADLINE
+#    endif
+#  endif
+#endif
+
 #ifndef HAVE_STRDUP
 char *strdup(const char *s);
 #endif