--- configure.org	Wed Jul 23 15:11:42 2003
+++ configure	Wed Jul 23 15:13:51 2003
@@ -3560,7 +3560,7 @@
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    allow_undefined_flag='-undefined suppress -flat_namespace'
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
@@ -10676,17 +10676,17 @@
 saveLDFLAGS="$LDFLAGS"
 if test "x$with_db3" != "x"; then
 	LDFLAGS="-L$with_db3/lib $LDFLAGS"
-	CFLAGS="-I$with_db3/include $CFLAGS"
+	CFLAGS="-I$with_db3/include/db3 $CFLAGS"
 fi;
 
-echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
-echo "configure:10684: checking for db_create in -ldb" >&5
+echo $ac_n "checking for db_create in -ldb-3.3""... $ac_c" 1>&6
+echo "configure:10684: checking for db_create in -ldb-3.3" >&5
 ac_lib_var=`echo db'_'db_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ldb  $LIBS"
+LIBS="-ldb-3.3  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 10692 "configure"
 #include "confdefs.h"
@@ -10835,7 +10835,7 @@
 	dl_src=../common/dldb.c
 	LIBS="-ldl $LIBS"
 else
-	LIBS="-ldb $LIBS"
+	LIBS="-ldb-3.3 $LIBS"
 	if test "X$with_db3" != "X"; then
 		LDFLAGS="`echo $with_db3/lib | sed "$LRscript"` $LDFLAGS"
 	fi