Another try at Kerberos autoconfiguration.

svn path=/trunk/; revision=1130

3 files changed, 11 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index 9ab2db52..bb783bdd 100644
--- a/configure.in
+++ b/configure.in
@@ -128,7 +128,7 @@ test "$with_POP2" = "yes" && AC_DEFINE(POP2_ENABLE)
 AC_ARG_WITH(kerberos,
 	[  --with-kerberos=DIR  point fetchmail compilation at a Kerberos directory])
 
-for dir in $with_kerberos /usr/kerberos /usr/athena
+for dir in $with_kerberos /usr/kerberos /usr/kerberosIV /usr/athena
 do
   if test -f "$dir/include/krb.h"
   then
diff --git a/driver.c b/driver.c
index c0768e6a..3d3078d4 100644
--- a/driver.c
+++ b/driver.c
@@ -41,8 +41,14 @@
 #endif
 
 #ifdef KERBEROS_V4
+#if defined (__bsdi__)
+#include <des.h> /* order of includes matters */
+#include <krb.h>
+#define krb_get_err_text(e) (krb_err_txt[e])
+#else
 #include <krb.h>
 #include <des.h>
+#endif /* ! defined (__bsdi__) */
 #include <netinet/in.h>
 #include <netdb.h>
 #endif /* KERBEROS_V4 */
diff --git a/imap.c b/imap.c
index 75533ebf..e3867af4 100644
--- a/imap.c
+++ b/imap.c
@@ -16,6 +16,10 @@
 #include  "socket.h"
 
 #ifdef KERBEROS_V4
+#if defined (__bsdi__)
+#include <des.h>
+#define krb_get_err_text(e) (krb_err_txt[e])
+#endif
 #include <krb.h>
 #endif /* KERBEROS_V4 */