NetBSD config changes.

svn path=/trunk/; revision=1765

4 files changed, 11 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index c05edd46..edbebbb2 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,12 @@
 				Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-4.4.5 ():
+* Make RPA logging use error() rather than stderr.
+* Autoconfiguration support for NetBSD.
+
+There are 273 people on fetchmail-friends and 209 on fetchmail-announce.
+
 fetchmail-4.4.4 (Wed May  6 10:08:15 EDT 1998):
 * Francois Wautier's fix for qvirtual.
 * Willem Hengeveld's fix for UID initialization.
diff --git a/configure.in b/configure.in
index 5bdbe34d..97131afe 100644
--- a/configure.in
+++ b/configure.in
@@ -258,11 +258,11 @@ then
     LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
     LIBS="$LIBS -lkrb -ldes"
 else
-    for dir in /usr/kerberos /usr/kerberosIV /usr/athena
+    for dir in /usr/include/kerberosIV /usr/kerberos/include /usr/kerberosIV/include /usr/athena/include
     do
-      if test -f "$dir/include/krb.h"
+      if test -f "$dir/krb.h"
       then
-        CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include"
+        CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir"
         LDEFLAGS="$LDEFLAGS -L$dir/lib"
         LIBS="$LIBS -lkrb -ldes"
         break
diff --git a/driver.c b/driver.c
index 84a968aa..aa2a2701 100644
--- a/driver.c
+++ b/driver.c
@@ -54,7 +54,7 @@
 #include <krb.h>
 #define krb_get_err_text(e) (krb_err_txt[e])
 #else
-#if defined(__FreeBSD__) || defined(__linux__)
+#if #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__)
 #define krb_get_err_text(e) (krb_err_txt[e])
 #include <krb.h>
 #include <des.h>
diff --git a/imap.c b/imap.c
index ae2098da..20d106c0 100644
--- a/imap.c
+++ b/imap.c
@@ -20,7 +20,7 @@
 #include <des.h>
 #define krb_get_err_text(e) (krb_err_txt[e])
 #endif
-#if defined (__FreeBSD__) || defined(__linux__)
+#if defined #if defined(__NetBSD__) || (__FreeBSD__) || defined(__linux__)
 #define krb_get_err_text(e) (krb_err_txt[e])
 #endif
 #include <krb.h>