Update translations and NEWS.

[~andy/fetchmail] / kerberos.h

diff --git a/kerberos.h b/kerberos.h
index 32cb93e993106bb28fc213dd35d5342156c88511..fc0689dadf50abb5be664559e103d719dc7186b6 100644 (file)
--- a/kerberos.h
+++ b/kerberos.h
@@ -11,18 +11,23 @@
 
 #ifdef KERBEROS_V5
 #include <krb5.h>
-#include <com_err.h>
+/* #include <com_err.h> */
 #endif
 
 #ifdef KERBEROS_V4
-#  if defined (__bsdi__) 
-#    include <des.h> /* order of includes matters */
-#    define krb_get_err_text(e) (krb_err_txt[e])
-#  endif
-#  include <krb.h>
-#  if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__)
-#    define krb_get_err_text(e) (krb_err_txt[e])
-#    include <des.h>
+#  ifdef KERBEROS_V4_V5
+#    include <kerberosIV/krb.h>
+#    include <kerberosIV/des.h>
+#  else
+#    if defined (__bsdi__) 
+#      include <des.h> /* order of includes matters */
+#      define krb_get_err_text(e) (krb_err_txt[e])
+#    endif
+#    include <krb.h>
+#    if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__)
+#      define krb_get_err_text(e) (krb_err_txt[e])
+#      include <des.h>
+#    endif
 #  endif
 #endif