--- configure.orig	Mon Mar 10 12:01:16 2003
+++ configure	Thu Mar 13 01:31:35 2003
@@ -11148,7 +11148,7 @@
 CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
 
 
-for ac_header in db.h db3/db.h
+for ac_header in db3/db.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -11341,9 +11341,9 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: Found db.h is not version $evolution_db_version" >&5
-echo "$as_me: error: Found db.h is not version $evolution_db_version" >&2;}
-   { (exit 1); exit 1; }; }
+#{ { echo "$as_me:$LINENO: error: Found db.h is not version $evolution_db_version" >&5
+#echo "$as_me: error: Found db.h is not version $evolution_db_version" >&2;}
+#   { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
@@ -13495,10 +13495,10 @@
 Example: --with-nspr-libs=/usr/lib" >&2;}
    { (exit 1); exit 1; }; }
        				else
-	       				nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+				    nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
 				fi
 			else
-				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+			    nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
 			fi
 
 			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
@@ -16710,7 +16710,7 @@
 idldir="$datadir/idl/evolution-$BASE_VERSION"
 
 
-serverdir="$libdir/bonobo/servers"
+serverdir="$prefix/libdata/bonobo/servers"
 
 
 evolutionuidir="$privdatadir/ui"