Conflict resolved.

CVS patchset: 5722
CVS date: 2002/09/19 21:06:40

8 files changed, 57 insertions, 56 deletions

diff --git a/db/dist/aclocal/libtool.ac b/db/dist/aclocal/libtool.ac
index 8e764711c..e99faf15e 100644
--- a/db/dist/aclocal/libtool.ac
+++ b/db/dist/aclocal/libtool.ac
@@ -1606,9 +1606,17 @@ else
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
 
-    #### Local change for Sleepycat's Berkeley DB [#5664]
-    # removed double quotes in the following line:
-    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    #### Local change for Sleepycat's Berkeley DB [#5664] [#6511]
+    case "$host_os" in
+    darwin[[12345]].*)
+       # removed double quotes in the following line:
+       archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+       ;;
+    *) # Darwin6.0 on (Mac OS/X Jaguar)
+       archive_cmds='$nonopt $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -dynamiclib -install_name $rpath/$soname $verstring'
+       ;;
+    esac
+    #### End of changes for Sleepycat's Berkeley DB [#5664] [#6511]
 
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
diff --git a/db/dist/aclocal/tcl.ac b/db/dist/aclocal/tcl.ac
index f1f97758c..7273044b5 100644
--- a/db/dist/aclocal/tcl.ac
+++ b/db/dist/aclocal/tcl.ac
@@ -1,4 +1,4 @@
-# Id: tcl.ac,v 11.13 2002/06/07 12:33:58 dda Exp 
+# Id: tcl.ac,v 11.14 2002/09/07 17:25:58 dda Exp 
 
 # The SC_* macros in this file are from the unix/tcl.m4 files in the Tcl
 # 8.3.0 distribution, with some minor changes.  For this reason, license
@@ -102,7 +102,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
 	# given by the Tcl spec are insufficient for our use.  [#5779]
 	#
 	case "$host_os" in
-	aix4.[2-9].*)
+	aix4.[[2-9]].*)
 		LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG"
 		LIBTSO_LIBS="$LIBTSO_LIBS -L$TCL_EXEC_PREFIX/lib -ltcl$TCL_VERSION";;
 	aix*)
diff --git a/db/dist/aclocal_java/ac_jni_include_dirs.ac b/db/dist/aclocal_java/ac_jni_include_dirs.ac
index 0435b555b..e01f78c77 100644
--- a/db/dist/aclocal_java/ac_jni_include_dirs.ac
+++ b/db/dist/aclocal_java/ac_jni_include_dirs.ac
@@ -28,7 +28,7 @@ dnl Note: This macro can work with the autoconf M4 macros for Java programs.
 dnl This particular macro is not part of the original set of macros.
 dnl
 dnl @author Don Anderson <dda@sleepycat.com>
-dnl @version Id: ac_jni_include_dirs.ac,v 1.7 2002/02/11 14:00:50 bostic Exp 
+dnl @version Id: ac_jni_include_dirs.ac,v 1.8 2002/09/04 21:27:30 dda Exp 
 dnl
 AC_DEFUN(AC_JNI_INCLUDE_DIR,[
 
@@ -50,32 +50,42 @@ case "$host_os" in
 			_JINC="$_JTOPDIR/Headers";;
 	*)		_JINC="$_JTOPDIR/include";;
 esac
+
+# If we find jni.h in /usr/include, then it's not a java-only tree, so
+# don't add /usr/include or subdirectories to the list of includes.
+# An extra -I/usr/include can foul things up with newer gcc's.
 if test -f "$_JINC/jni.h"; then
-	JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JINC"
+	if test "$_JINC" != "/usr/include"; then
+		JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JINC"
+	fi
 else
 	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
 	if test -f "$_JTOPDIR/include/jni.h"; then
-		JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"
+		if test "$_JTOPDIR" != "/usr"; then
+			JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"
+		fi
 	else
 		AC_MSG_ERROR([cannot find java include files])
 	fi
 fi
 
 # get the likely subdirectories for system specific java includes
-case "$host_os" in
-aix*)		_JNI_INC_SUBDIRS="aix";;
-bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
-linux*)		_JNI_INC_SUBDIRS="linux genunix";;
-osf*)		_JNI_INC_SUBDIRS="alpha";;
-solaris*)	_JNI_INC_SUBDIRS="solaris";;
-*)		_JNI_INC_SUBDIRS="genunix";;
-esac
+if test "$_JTOPDIR" != "/usr"; then
+	case "$host_os" in
+	aix*)		_JNI_INC_SUBDIRS="aix";;
+	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
+	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
+	osf*)		_JNI_INC_SUBDIRS="alpha";;
+	solaris*)	_JNI_INC_SUBDIRS="solaris";;
+	*)		_JNI_INC_SUBDIRS="genunix";;
+	esac
+fi
 
 # add any subdirectories that are present
-for JINCSUBDIR in $_JNI_INC_SUBDIRS
+for _JINCSUBDIR in $_JNI_INC_SUBDIRS
 do
-	if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then
-		JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR"
+	if test -d "$_JTOPDIR/include/$_JINCSUBDIR"; then
+		JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$_JINCSUBDIR"
 	fi
 done
 ])
diff --git a/db/dist/buildrel b/db/dist/buildrel
index bddb1d1ff..9b7ef87db 100644
--- a/db/dist/buildrel
+++ b/db/dist/buildrel
@@ -1,12 +1,12 @@
 #!/bin/sh -
-#	Id: buildrel,v 1.34 2002/06/24 17:48:25 bostic Exp 
+#	Id: buildrel,v 1.39 2002/09/06 14:30:31 bostic Exp 
 #
 # Build the distribution archives.
 #
 # A set of commands intended to be cut and pasted into a csh window.
 
 # Development tree, release home.
-setenv D /a/db
+setenv D `pwd`
 
 # Update the release number.
 cd $D/dist
@@ -48,8 +48,8 @@ cd $R/build_run && make prefix=`pwd`/BDB install
 
 # Clean up the tree.
 cd $R && rm -rf build_run docs_src
-cd $R && rm -rf test/TODO test/upgrade
-cd $R && rm -rf test_perf test_purify test_server test_thread test_vxworks
+cd $R && rm -rf test/TODO test/upgrade test_perf test_purify
+cd $R && rm -rf test_server test_thread test_vxworks test_xa
 
 # ACQUIRE ROOT PRIVILEGES
 cd $R && find . -type d | xargs chmod 775
@@ -73,11 +73,19 @@ chmod 444 $T
 
 # Create the non-crypto tree.
 setenv RNC "$R/../db-$VERSION.NC"
-rm -rf $R/../__TMP && mkdir $R/../__TMP
+rm -rf $RNC $R/../__TMP && mkdir $R/../__TMP
 cd $R/../__TMP && gzcat $T | tar xpf - && mv -i db-$VERSION $RNC
 cd $R && rm -rf $R/../__TMP
 cd $RNC/dist && sh s_crypto
 
+# ACQUIRE ROOT PRIVILEGES
+cd $RNC && find . -type d | xargs chmod 775
+cd $RNC && find . -type f | xargs chmod 444
+cd $RNC && chmod 664 build_win32/*.dsp
+cd $RNC/dist && sh s_perm
+chown -R 100.100 $RNC
+# DISCARD ROOT PRIVILEGES
+
 # Create the non-crypto tar archive release.
 setenv T "$R/../db-$VERSION.NC.tar.gz"
 cd $RNC/.. && tar cf - db-$VERSION.NC | gzip --best > $T
diff --git a/db/dist/configure.ac b/db/dist/configure.ac
index 8ff1ee715..6086149ea 100644
--- a/db/dist/configure.ac
+++ b/db/dist/configure.ac
@@ -1,4 +1,4 @@
-# Id: configure.ac,v 11.155 2002/07/12 18:56:44 bostic Exp 
+# Id: configure.ac,v 11.156 2002/09/04 13:51:17 bostic Exp 
 # Process this file with autoconf to produce a configure script.
 
 PACKAGE=db
@@ -495,20 +495,8 @@ if test "$db_cv_open_o_direct" = yes; then
 	AH_TEMPLATE(HAVE_O_DIRECT, [Define to 1 if you have the O_DIRECT flag.])
 fi
 
-# You can't build C++ with big-file support on HP-UX, the include files
-# are wrong.
-largefile_ok=yes
-case "$host_os" in
-hpux*)
-	if test "$db_cv_cxx" = "yes"; then
-AC_MSG_WARN([Large file and C++ API support are incompatible on HP-UX])
-AC_MSG_WARN([large file support has been turned off.])
-		largefile_ok=no
-	fi;;
-esac
-if test "$largefile_ok" = yes; then
-	AC_SYS_LARGEFILE
-fi
+# Check for largefile support.
+AC_SYS_LARGEFILE
 
 # Figure out how to create shared regions.
 #
diff --git a/db/dist/pubdef.in b/db/dist/pubdef.in
index 55fdae244..f42363022 100644
--- a/db/dist/pubdef.in
+++ b/db/dist/pubdef.in
@@ -55,7 +55,6 @@ DB_CONSUME		D I J
 DB_CONSUME_WAIT		D I J
 DB_CREATE		D I J
 DB_CURRENT		D I J
-DB_CURRENT_PUT		D * *
 DB_CXX_NO_EXCEPTIONS	D I J
 DB_DBM_HSEARCH		* I *
 DB_DBT_APPMALLOC	D I *
diff --git a/db/dist/vx_setup/vx_demofile.in b/db/dist/vx_setup/vx_demofile.in
index 08593f653..42a698ea3 100644
--- a/db/dist/vx_setup/vx_demofile.in
+++ b/db/dist/vx_setup/vx_demofile.in
@@ -1,3 +1,3 @@
-windlink/sleepycat/BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@/build_vxworks/demo/DBdemo.wpj
-windlink/sleepycat/BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@/build_vxworks/demo/README
-windlink/sleepycat/BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@/build_vxworks/demo/dbdemo.c
+windlink/sleepycat/BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@/build_vxworks/dbdemo/dbdemo.wpj
+windlink/sleepycat/BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@/build_vxworks/dbdemo/README
+windlink/sleepycat/BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@/build_vxworks/dbdemo/dbdemo.c
diff --git a/db/dist/win_exports.in b/db/dist/win_exports.in
index e20fbd168..0ff425a5f 100644
--- a/db/dist/win_exports.in
+++ b/db/dist/win_exports.in
@@ -1,4 +1,4 @@
-# Id: win_exports.in,v 1.24 2002/07/15 06:07:55 mjc Exp 
+# Id: win_exports.in,v 1.25 2002/08/29 14:22:21 margo Exp 
 
 # Standard interfaces.
 	db_create
@@ -31,8 +31,6 @@
 	db_env_set_func_unmap
 	db_env_set_func_write
 	db_env_set_func_yield
-	db_env_set_thread_func
-	db_env_xa_attach
 
 # Needed for application-specific logging and recovery routines.
 	__db_add_recovery
@@ -134,13 +132,3 @@
 	__qam_init_print
 	__qam_pgin_out
 	__txn_init_print
-	__db_xa_close
-	__db_xa_commit
-	__db_xa_end
-	__db_xa_forget
-	__db_xa_open
-	__db_xa_prepare
-	__db_xa_recover
-	__db_xa_rollback
-	__db_xa_start
-	__db_rmid_to_env