diff -u -r ./db-3.2.9.patch /Users/peterlin/berkeleydb/db-3.2.9.patch
--- ./db-3.2.9.patch	Mon Jun 11 07:09:22 2001
+++ /Users/peterlin/berkeleydb/db-3.2.9.patch	Sun Jan  6 20:55:08 2002
@@ -1,45 +1,646 @@
-*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
---- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
-***************
-*** 7,12 ****
---- 7,14 ----
-  
-  #include "db_config.h"
-  
-+ #include <cstdarg>
-+ 
-  #ifndef lint
-  static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $";
-  #endif /* not lint */
-*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_table.cpp	Thu Jan 11 19:28:22 2001
---- build/unxsols3.pro/db-3.2.9/cxx/cxx_table.cpp	Mon Jun 11 15:51:59 2001
-***************
-*** 7,12 ****
---- 7,14 ----
-  
-  #include "db_config.h"
-  
-+ #include <cstdarg>
-+ 
-  #ifndef lint
-  static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $";
-  #endif /* not lint */
-*** ./unxsols3.pro/misc/db-3.2.9/dist/Makefile.in	Fri Dec  1 00:07:33 2000
---- build/unxsols3.pro/db-3.2.9/dist/Makefile.in	Mon Jun 11 15:39:41 2001
-***************
-*** 8,14 ****
-  ##################################################
-  CPPFLAGS=	-I$(builddir) -I$(srcdir)/include @CPPFLAGS@
-  CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@
-! CXXFLAGS=	-c $(CPPFLAGS) @CXXFLAGS@
-  
-  CC=		@MAKEFILE_CC@
-  CCLINK=		@MAKEFILE_CCLINK@
---- 8,14 ----
-  ##################################################
-  CPPFLAGS=	-I$(builddir) -I$(srcdir)/include @CPPFLAGS@
-  CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@
-! CXXFLAGS=	-c $(SOLARINC) $(CPPFLAGS) @CXXFLAGS@
-  
-  CC=		@MAKEFILE_CC@
-  CCLINK=		@MAKEFILE_CCLINK@
+diff -u -r /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp
+--- /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 10:28:22 2001
++++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp	Sat Dec  1 11:35:16 2001
+@@ -7,6 +7,8 @@
+ 
+ #include "db_config.h"
+ 
++#include <cstdarg>
++
+ #ifndef lint
+ static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $";
+ #endif /* not lint */
+Only in build/unxmacxp.pro/db-3.2.9/cxx: cxx_app.cpp~
+diff -u -r /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp
+--- /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp	Thu Jan 11 10:28:22 2001
++++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp	Sat Dec  1 11:35:16 2001
+@@ -7,6 +7,8 @@
+ 
+ #include "db_config.h"
+ 
++#include <cstdarg>
++
+ #ifndef lint
+ static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $";
+ #endif /* not lint */
+Only in build/unxmacxp.pro/db-3.2.9/cxx: cxx_table.cpp~
+Only in build/unxmacxp.pro/db-3.2.9/dist: Makefile
+diff -u -r /Users/peterlin/db-3.2.9/dist/Makefile.in build/unxmacxp.pro/db-3.2.9/dist/Makefile.in
+--- /Users/peterlin/db-3.2.9/dist/Makefile.in	Thu Nov 30 15:07:33 2000
++++ build/unxmacxp.pro/db-3.2.9/dist/Makefile.in	Sat Dec  1 11:35:16 2001
+@@ -8,7 +8,7 @@
+ ##################################################
+ CPPFLAGS=	-I$(builddir) -I$(srcdir)/include @CPPFLAGS@
+ CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@
+-CXXFLAGS=	-c $(CPPFLAGS) @CXXFLAGS@
++CXXFLAGS=	-c $(SOLARINC) $(CPPFLAGS) @CXXFLAGS@
+ 
+ CC=		@MAKEFILE_CC@
+ CCLINK=		@MAKEFILE_CCLINK@
+Only in build/unxmacxp.pro/db-3.2.9/dist: Makefile.in~
+Only in build/unxmacxp.pro/db-3.2.9/dist: config.cache
+Only in build/unxmacxp.pro/db-3.2.9/dist: config.log
+Only in build/unxmacxp.pro/db-3.2.9/dist: config.status
+diff -u -r /Users/peterlin/db-3.2.9/dist/configure build/unxmacxp.pro/db-3.2.9/dist/configure
+--- /Users/peterlin/db-3.2.9/dist/configure	Wed Jan 24 07:16:18 2001
++++ build/unxmacxp.pro/db-3.2.9/dist/configure	Sun Dec 23 21:31:39 2001
+@@ -1781,17 +1781,31 @@
+ 		echo "$ac_t""$JAVACABS" 1>&6
+ 	done
+ 	JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+-	if test -f "$JTOPDIR/include/jni.h"; then
+-		CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include"
++
++# [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers
++# name and not include
++	
++	if test "$host_os" = "darwin5.2"; then
++		JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'`
++		echo "$JFRAMEDIR"
++		if test -f "$JFRAMEDIR/Headers/jni.h"; then
++			CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers"
++		else
++			{ echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Headers/jni.h)" 1>&2; exit 1; }
++		fi
+ 	else
+-		JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
+ 		if test -f "$JTOPDIR/include/jni.h"; then
+ 			CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
+ 		else
+-			{ echo "configure: error: cannot find java include files" 1>&2; exit 1; }
++			JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
++			if test -f "$JTOPDIR/include/jni.h"; then
++				CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
++			else
++				{ echo "configure: error: cannot find java include files" 1>&2; exit 1; }
++			fi
+ 		fi
+ 	fi
+-
++	
+ 	case "$host_os" in
+ 	solaris*)	JINCSUBDIRS="solaris";;
+ 	linux*)		JINCSUBDIRS="linux genunix";;
+Only in build/unxmacxp.pro/db-3.2.9/dist: db.h
+Only in build/unxmacxp.pro/db-3.2.9/dist: db_config.h
+Only in build/unxmacxp.pro/db-3.2.9/dist: db_int.h
+Only in build/unxmacxp.pro/db-3.2.9/dist: include.tcl
+diff -u -r /Users/peterlin/db-3.2.9/dist/ltconfig build/unxmacxp.pro/db-3.2.9/dist/ltconfig
+--- /Users/peterlin/db-3.2.9/dist/ltconfig	Fri Oct 13 13:23:00 2000
++++ build/unxmacxp.pro/db-3.2.9/dist/ltconfig	Sat Jan  5 17:44:55 2002
+@@ -678,6 +678,11 @@
+   cygwin* | mingw* | os2*)
+     # We can build DLLs from non-PIC.
+     ;;
++  darwin* | rhapsody*)
++    # PIC is the default on this platform
++    # Common symbols not allowed in MH_DYLIB files
++    pic_flag='-fno-common'
++    ;;
+   amigaos*)
+     # FIXME: we need at least 68020 code to build shared libraries, but
+     # adding the `-m68020' flag to GCC prevents building anything better,
+@@ -773,8 +778,8 @@
+   echo "int some_variable = 0;" > conftest.c
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS $pic_flag -DPIC"
+-  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
+-  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
++  echo "$progname:781: checking if $compiler PIC flag $pic_flag works" >&5
++  if { (eval echo $progname:782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+     # Append any warnings to the config.log.
+     cat conftest.err 1>&5
+     
+@@ -826,8 +831,8 @@
+ chmod -w .
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -o out/conftest2.o"
+-echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
+-if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
++echo "$progname:834: checking if $compiler supports -c -o file.o" >&5
++if { (eval echo $progname:835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
+ 
+   # The compiler can only warn and ignore the option if not recognized
+   # So say no if there are warnings
+@@ -859,8 +864,8 @@
+   echo "int some_variable = 0;" > conftest.c
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -c -o conftest.lo"
+-  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
+-if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
++  echo "$progname:867: checking if $compiler supports -c -o file.lo" >&5
++if { (eval echo $progname:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
+ 
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+@@ -911,8 +916,8 @@
+   echo "int some_variable = 0;" > conftest.c
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
+-  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
++  echo "$progname:919: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  if { (eval echo $progname:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
+ 
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+@@ -955,8 +960,8 @@
+ echo 'main(){return(0);}' > conftest.c
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $link_static_flag"
+-echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
+-if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++echo "$progname:963: checking if $compiler static flag $link_static_flag works" >&5
++if { (eval echo $progname:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   echo "$ac_t$link_static_flag" 1>&6
+ else
+   echo "$ac_t"none 1>&6
+@@ -988,7 +993,7 @@
+   if test "$with_gcc" = yes; then
+     # Check if gcc -print-prog-name=ld gives a path.
+     echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
+-    echo "$progname:991: checking for ld used by GCC" >&5
++    echo "$progname:996: checking for ld used by GCC" >&5
+     ac_prog=`($CC -print-prog-name=ld) 2>&5`
+     case "$ac_prog" in
+     # Accept absolute paths.
+@@ -1012,10 +1017,10 @@
+     esac
+   elif test "$with_gnu_ld" = yes; then
+     echo $ac_n "checking for GNU ld... $ac_c" 1>&6
+-    echo "$progname:1015: checking for GNU ld" >&5
++    echo "$progname:1020: checking for GNU ld" >&5
+   else
+     echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+-    echo "$progname:1018: checking for non-GNU ld" >&5
++    echo "$progname:1023: checking for non-GNU ld" >&5
+   fi
+ 
+   if test -z "$LD"; then
+@@ -1304,11 +1309,7 @@
+     allow_undefined_flag=' ${wl}-berok'
+     archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
+     archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
+-    #### local change for Sleepycat DB:
+-    # On AIX 4.3.2 (at least), -bexpall exports too much,
+-    # causing symbol conflicts. This was:
+-    #     case "$host_os" in aix4.[01]|aix4.[01].*)
+-    case "$host_os" in aix4.*)
++    case "$host_os" in aix4.[01]|aix4.[01].*)
+       # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
+       always_export_symbols=yes ;;
+     esac
+@@ -1371,6 +1372,23 @@
+     hardcode_shlibpath_var=no
+     ;;
+ 
++  darwin* | rhapsody*)
++    case "$host_os" in
++    rhapsody* | darwin1.[012])
++      allow_undefined_flag='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      allow_undefined_flag='-flat_namespace -undefined suppress'
++      ;;
++    esac
++    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
+   hpux9* | hpux10* | hpux11*)
+     case "$host_os" in
+     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
+@@ -1443,12 +1461,6 @@
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator=:
+     ;;
+-  rhapsody*)
+-    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flags_spec='-L$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+                                        
+   sco3.2v5*)
+     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+@@ -1654,11 +1666,11 @@
+ main(){nm_test_var='a';nm_test_func();return(0);}
+ EOF
+ 
+-  echo "$progname:1653: checking if global_symbol_pipe works" >&5
+-  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
++  echo "$progname:1669: checking if global_symbol_pipe works" >&5
++  if { (eval echo $progname:1670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+-    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
++    if { echo "$progname:1673: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+ 
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+@@ -1710,7 +1722,7 @@
+ 	  save_CFLAGS="$CFLAGS"
+ 	  LIBS="conftstm.$objext"
+ 	  CFLAGS="$CFLAGS$no_builtin_flag"
+-	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++	  if { (eval echo $progname:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ 	    pipe_works=yes
+ 	  else
+ 	    echo "$progname: failed program was:" >&5
+@@ -1919,6 +1931,27 @@
+   esac
+   ;;
+ 
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[012])
++    file_magic_test_file='/System/Library/Frameworks/System.framework/System'
++    ;;
++  *) # Darwin 1.3 on
++    file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
+ gnu*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -1941,14 +1974,14 @@
+   soname_spec='${libname}${release}.sl$major'
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
+-
+-  #### local change for Sleepycat DB: [#1990]
+-  # The following 3 lines added, otherwise dependent libraries are not allowed
+-  # on HP.  We use dependent libraries in a very straightforward way, to
+-  # incorporate -lnsl into libtcl.sl, and for testing only.
+-  deplibs_check_method='file_magic PA-RISC[1-9][0-9.]* shared library'
+-  file_magic_cmd=/usr/bin/file
+-  file_magic_test_file=`echo /lib/libc.sl*`
++  case "$host_os" in
++  hpux10.20*)
++    # TODO:  Does this work for hpux-11 too?
++    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    file_magic_cmd=/usr/bin/file
++    file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
+   ;;
+ 
+ irix5* | irix6*)
+@@ -2057,23 +2090,11 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-rhapsody*)
+-  version_type=sunos
+-  library_names_spec='${libname}.so'
+-  soname_spec='${libname}.so'
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  deplibs_check_method=pass_all
+-  ;;
+-
+ sco3.2v5*)
+   version_type=osf
+   soname_spec='${libname}${release}.so$major'
+   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+   shlibpath_var=LD_LIBRARY_PATH
+-  #### local change for Sleepycat DB:
+-  # The following line added, otherwise dependent libraries are not allowed
+-  # on SCO.  We use dependent libraries in a very straightforward way.
+-  deplibs_check_method='pass_all'
+   ;;
+ 
+ solaris*)
+@@ -2153,19 +2174,6 @@
+   fi
+   ;;
+ 
+-#### local change for Sleepycat DB:
+-# Add in the QNX support from QNX.
+-nto-qnx)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  deplibs_check_method='pass_all'
+-  ;;
+-
+ *)
+   dynamic_linker=no
+   ;;
+@@ -2266,7 +2274,7 @@
+ if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
+   lt_cv_dlopen=no lt_cv_dlopen_libs=
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "$progname:2248: checking for dlopen in -ldl" >&5
++echo "$progname:2277: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2274,7 +2282,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2256 "ltconfig"
++#line 2285 "ltconfig"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+@@ -2287,7 +2295,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo $progname:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2306,12 +2314,12 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+-echo "$progname:2288: checking for dlopen" >&5
++echo "$progname:2317: checking for dlopen" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2293 "ltconfig"
++#line 2322 "ltconfig"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char dlopen(); below.  */
+ #include <assert.h>
+@@ -2336,7 +2344,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo $progname:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_dlopen=yes"
+ else
+@@ -2353,7 +2361,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
+-echo "$progname:2335: checking for dld_link in -ldld" >&5
++echo "$progname:2364: checking for dld_link in -ldld" >&5
+ ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2361,7 +2369,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2343 "ltconfig"
++#line 2372 "ltconfig"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+@@ -2374,7 +2382,7 @@
+ dld_link()
+ ; return 0; }
+ EOF
+-if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo $progname:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2393,12 +2401,12 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for shl_load""... $ac_c" 1>&6
+-echo "$progname:2375: checking for shl_load" >&5
++echo "$progname:2404: checking for shl_load" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2380 "ltconfig"
++#line 2409 "ltconfig"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shl_load(); below.  */
+ #include <assert.h>
+@@ -2423,7 +2431,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo $progname:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_shl_load=yes"
+ else
+@@ -2441,7 +2449,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "$progname:2423: checking for shl_load in -ldld" >&5
++echo "$progname:2452: checking for shl_load in -ldld" >&5
+ ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2449,7 +2457,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2431 "ltconfig"
++#line 2460 "ltconfig"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2463,7 +2471,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo $progname:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2506,17 +2514,17 @@
+ for ac_hdr in dlfcn.h; do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "$progname:2488: checking for $ac_hdr" >&5
++echo "$progname:2517: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2493 "ltconfig"
++#line 2522 "ltconfig"
+ #include <$ac_hdr>
+ int fnord = 0;
+ EOF
+ ac_try="$ac_compile >/dev/null 2>conftest.out"
+-{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo $progname:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2544,7 +2552,7 @@
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+   echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
+-echo "$progname:2526: checking whether a program can dlopen itself" >&5
++echo "$progname:2555: checking whether a program can dlopen itself" >&5
+ if test "${lt_cv_dlopen_self+set}" = set; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2552,7 +2560,7 @@
+     lt_cv_dlopen_self=cross
+   else
+     cat > conftest.c <<EOF
+-#line 2534 "ltconfig"
++#line 2563 "ltconfig"
+ 
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+@@ -2598,7 +2606,7 @@
+ 	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
+ 
+ EOF
+-if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo $progname:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   lt_cv_dlopen_self=yes
+ else
+@@ -2617,7 +2625,7 @@
+   if test "$lt_cv_dlopen_self" = yes; then
+     LDFLAGS="$LDFLAGS $link_static_flag"
+   echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
+-echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
++echo "$progname:2628: checking whether a statically linked program can dlopen itself" >&5
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2625,7 +2633,7 @@
+     lt_cv_dlopen_self_static=cross
+   else
+     cat > conftest.c <<EOF
+-#line 2607 "ltconfig"
++#line 2636 "ltconfig"
+ 
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+@@ -2671,7 +2679,7 @@
+     if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
+ 
+ EOF
+-if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo $progname:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   lt_cv_dlopen_self_static=yes
+ else
+@@ -3133,4 +3141,3 @@
+ # mode:shell-script
+ # sh-indentation:2
+ # End:
+-#! /bin/bash
+Only in build/unxmacxp.pro/db-3.2.9/dist: ltconfig~
+diff -u -r /Users/peterlin/db-3.2.9/dist/ltmain.sh build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh
+--- /Users/peterlin/db-3.2.9/dist/ltmain.sh	Sun Aug  6 11:32:00 2000
++++ build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh	Sat Jan  5 17:44:58 2002
+@@ -1079,6 +1079,11 @@
+ 	    # These systems don't actually have c library (as such)
+ 	    continue
+ 	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    continue
++	    ;;
+ 	  esac
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+@@ -1086,6 +1091,11 @@
+ 	    # These systems don't actually have math library (as such)
+ 	    continue
+ 	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody math library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    continue
++	    ;;
+ 	  esac
+ 	fi
+ 	deplibs="$deplibs $arg"
+@@ -1753,6 +1763,16 @@
+ 	  versuffix="-$major-$age-$revision"
+ 	  ;;
+ 
++	darwin)
++	  # Like Linux, but with the current version available in
++	  # verstring for coding it into the library header
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  # Darwin ld doesn't like 0 for these options...
++	  minor_current=`expr $current + 1`
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  ;;
++
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+@@ -1763,7 +1783,16 @@
+ 	# Clear the version info if we defaulted, and they specified a release.
+ 	if test -z "$vinfo" && test -n "$release"; then
+ 	  major=
+-	  verstring="0.0"
++	  case "$version_type" in
++	  darwin)
++	    # we can't check for "0.0" in archive_cmds due to quoting
++	    # problems, so we reset it completely
++	    verstring=""
++	    ;;
++	  *)
++	    verstring="0.0"
++	    ;;
++	  esac
+ 	  if test "$need_version" = no; then
+ 	    versuffix=
+ 	  else
+@@ -1795,14 +1824,10 @@
+ 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ 	  # these systems don't actually have a c library (as such)!
+ 	  ;;
+-
+-        #### local change for Sleepycat DB: [#2380]
+-        # The following case is added, since the linker's -pthread
+-        # option implicitly controls use of -lc or -lc_r.
+-	*freebsd*)
+-	  # defer to whether the user wants -lc, or -lc_r
++        *-*-rhapsody* | *-*-darwin1.[012])
++	  # Rhapsody C library is in the System framework
++	  deplibs="$deplibs -framework System"
+ 	  ;;
+-
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -4026,4 +4051,3 @@
+ # mode:shell-script
+ # sh-indentation:2
+ # End:
+-#! /bin/bash
+Only in build/unxmacxp.pro/db-3.2.9/dist: ltmain.sh~
+Only in build/unxmacxp.pro/db-3.2.9/java: classes
+Only in build/unxmacxp.pro/db-3.2.9: out
diff -u -r ./makefile.mk /Users/peterlin/berkeleydb/makefile.mk
--- ./makefile.mk	Wed Jun 20 11:43:52 2001
+++ /Users/peterlin/berkeleydb/makefile.mk	Sun Jan  6 20:55:08 2002
@@ -85,7 +85,7 @@
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=make
 
-OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so
+OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.dylib
 
 OUT2BIN=java$/classes$/db.jar