--- configure.orig	Tue Nov 15 17:58:33 2005
+++ configure	Tue Nov 15 18:02:37 2005
@@ -23732,6 +23732,15 @@
     SOFTOKN3_LIB=''
     HAL_REQUIREMENT=''
     ;;
+*freebsd*) os_win32=no
+    NO_UNDEFINED=''
+    SOCKET_LIBS=''
+    SOEXT='.so'
+    SA_JUNK_PLUGIN=sa-junk-plugin
+    DL_LIB=''
+    SOFTOKN3_LIB='-lsoftokn3'
+    HAL_REQUIREMENT='hal'
+    ;;
 *)  os_win32=no
     NO_UNDEFINED=''
     SOEXT='.so'
@@ -26280,6 +26289,7 @@
 		#include <sys/socket.h>
 		#include <netinet/in.h>
 		#include <netdb.h>
+		#include <stdio.h>
 
 
 int
@@ -27980,7 +27990,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
@@ -33143,7 +33153,7 @@
 idldir="$datadir/idl/evolution-$BASE_VERSION"
 
 
-serverdir="$libdir/bonobo/servers"
+serverdir="$prefix/libdata/bonobo/servers"
 
 
 evolutionuidir="$privdatadir/ui"