$FreeBSD$

--- configure.orig	Tue Sep  4 17:59:26 2001
+++ configure	Tue Sep  4 18:11:25 2001
@@ -5667,7 +5667,7 @@
 
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $DB3_CFLAGS"
-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
@@ -5741,7 +5741,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*
 
@@ -5852,7 +5852,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"
@@ -6333,8 +6333,8 @@
 fi
 
 
-THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
-THREADS_CFLAGS="`glib-config --cflags gthread`"
+THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"
+THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"
 
 
 
@@ -6894,8 +6894,8 @@
 	fi
 
 
-GLIB_CFLAGS="`glib-config --cflags`"
-GLIB_LIBS="`glib-config --libs`"
+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
+GLIB_LIBS="`$GLIB_CONFIG --libs`"
 
 
 
@@ -9415,10 +9415,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.