--- configure.orig	2007-10-28 12:24:23.000000000 -0500
+++ configure	2007-10-28 12:26:19.000000000 -0500
@@ -23831,6 +23831,16 @@
     SOFTOKN3_LIB=''
     HAL_REQUIREMENT=''
     ;;
+*freebsd*) os_win32=no
+    NO_UNDEFINED=''
+    SOCKET_LIBS=''
+    SOEXT='.so'
+    SA_JUNK_PLUGIN=sa-junk-plugin
+    BF_JUNK_PLUGIN=bogo-junk-plugin
+    DL_LIB=''
+    SOFTOKN3_LIB='-lsoftokn3'
+    HAL_REQUIREMENT='hal'
+    ;;
 *)  os_win32=no
     NO_UNDEFINED=''
     SOEXT='.so'
@@ -25449,6 +25459,7 @@
 		#include <sys/socket.h>
 		#include <netinet/in.h>
 		#include <netdb.h>
+		#include <stdio.h>
 
 		#define BUFSIZE (sizeof(struct hostent)+10)
 
@@ -29382,7 +29393,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"
 	sunlibs="-lkrb5 -lgss"
 	{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
@@ -37936,7 +37947,7 @@
 idldir='${datadir}'/idl/evolution-$BASE_VERSION
 
 
-serverdir="$libdir/bonobo/servers"
+serverdir="$prefix/libdata/bonobo/servers"
 
 
 evolutionuidir="$privdatadir/ui"