--- configure.orig	Fri Jul 29 17:13:44 2005
+++ configure	Fri Jul 29 17:15:52 2005
@@ -23461,6 +23461,13 @@
     DL_LIB=''
     SOFTOKN3_LIB=''
     ;;
+*freebsd*)
+    os_win32=no
+    NO_UNDEFINED=''
+    SOCKET_LIBS=''
+    DL_LIB=''
+    SOFTOKN3_LIB='-lsoftokn3'
+    ;;
 *)  os_win32=no
     NO_UNDEFINED=''
     SOCKET_LIBS=''
@@ -27135,7 +27142,7 @@
 		#include <sys/socket.h>
 		#include <netinet/in.h>
 		#include <netdb.h>
-
+		#include <stdio.h>
 
 int
 main ()
@@ -27873,7 +27880,7 @@
 	LDFLAGS_save="$LDFLAGS"
 
 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
 	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
 if test "${ac_cv_lib_kerberos5+set}" = set; then
@@ -31176,7 +31183,7 @@
 imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
 
 
-serverdir="$libdir/bonobo/servers"
+serverdir="$prefix/libdata/bonobo/servers"
 
 
 extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions