$FreeBSD$

--- configure.orig	Fri Sep 28 13:40:57 2001
+++ configure	Fri Sep 28 13:43:29 2001
@@ -9255,7 +9255,7 @@
 
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
-for ac_hdr in db.h db3/db.h
+for ac_hdr in db3/db.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -9329,7 +9329,7 @@
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
+#  { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
 fi
 rm -f conftest*
 
@@ -9349,7 +9349,7 @@
 	ac_cv_db3_ldadd=""
 
 	for name in db db3 db-3.1; do
-		LIBS="$LIBS_save $with_db3_libs/lib${name}.a"
+		LIBS="$LIBS_save $with_db3_libs/lib${name}.so"
 		cat > conftest.$ac_ext <<EOF
 #line 9355 "configure"
 #include "confdefs.h"
@@ -9370,7 +9370,7 @@
 if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
-			ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a"
+			ac_cv_db3_ldadd="$with_db3_libs/lib${name}.so"
 			break
 		
 else
@@ -9440,7 +9440,7 @@
 
 echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
 if test "$ac_cv_db3_lib_version_match" = no; then
-	{ echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
+#	{ echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
 fi
 
 CPPFLAGS="$CPPFLAGS_save"
@@ -12738,10 +12738,10 @@
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
+#  case "$ac_given_INSTALL" in
+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+#        esac
 
       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.