--- configure.orig	Wed Apr 11 20:01:06 2007
+++ configure	Thu Apr 12 01:10:01 2007
@@ -24916,6 +24916,15 @@ case "$host" in
     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'
@@ -24979,6 +24988,7 @@ int main (int argc, char **argv)
 {
         iconv_t cd;
         cd = iconv_open ("UTF-8", "ISO-8859-1");
+        return (0);
 }
 
 _ACEOF
@@ -26594,6 +26604,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 		#include <sys/socket.h>
 		#include <netinet/in.h>
 		#include <netdb.h>
+		#include <stdio.h>
 
 		#define BUFSIZE (sizeof(struct hostent)+10)
 
@@ -30819,7 +30830,7 @@ if test "x${with_krb5}" != "xno"; then
 	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
@@ -37148,7 +37159,7 @@ componentdir="$privlibdir/components"
 idldir='${datadir}'/idl/evolution-$BASE_VERSION
 
 
-serverdir="$libdir/bonobo/servers"
+serverdir="$prefix/libdata/bonobo/servers"
 
 
 evolutionuidir="$privdatadir/ui"