Rearrange directories to keep Makefile.am with the sources.

--HG--
rename : build_posix/AUTHORS => AUTHORS
rename : build_posix/bench/tcbench/Makefile.am => bench/tcbench/Makefile.am
rename : build_posix/configure.ac => configure.ac
rename : build_posix/ext/compressors/bzip2_compress/Makefile.am => ext/compressors/bzip2_compress/Makefile.am
rename : build_posix/ext/compressors/nop_compress/Makefile.am => ext/compressors/nop_compress/Makefile.am
rename : build_posix/test/format/Makefile.am => test/format/Makefile.am
rename : build_posix/test/insert/Makefile.am => test/insert/Makefile.am
rename : build_posix/test/salvage/Makefile.am => test/salvage/Makefile.am
rename : build_posix/test/thread/Makefile.am => test/thread/Makefile.am

16 files changed, 52 insertions, 73 deletions

diff --git a/build_posix/AUTHORS b/AUTHORS
index c6da2d63818..c6da2d63818 100644
--- a/build_posix/AUTHORS
+++ b/AUTHORS
diff --git a/README b/README
index f3627a0adb5..b8c8641a274 100644
--- a/README
+++ b/README
@@ -1,21 +1,20 @@
-WiredTiger 0.7.0: (August 11, 2011)
+WiredTiger 0.7.0: (September  1, 2011)
 
 This is version 0.7.0 of WiredTiger.
 
 See the file LICENSE for redistribution information.
 
-To view release and installation documentation, load the distribution
-file docs/index.html into your web browser.
+To view release and installation documentation, open docs/index.html
+in your web browser.
 
 To build in a POSIX environment (for example, Linux or other UNIX-like
-system), change directory to build_posix and enter:
+system), run:
 
-	./configure
-	make
+	./configure && make
 
 To install in the standard POSIX environment locations, enter:
 
 	make install
 
-For more information on installation locations, see the WiredTiger
-documentation.
+For more information on build and installation options, see the
+WiredTiger documentation.
diff --git a/build_posix/bench/tcbench/Makefile.am b/bench/tcbench/Makefile.am
index d6fa98caff7..3474e076c76 100644
--- a/build_posix/bench/tcbench/Makefile.am
+++ b/bench/tcbench/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = -I$(top_builddir)
 LDADD = -L$(top_builddir) -lwiredtiger
-VPATH = $(top_srcdir)/../$(subdir)
 
 noinst_PROGRAMS = wttest
 wttest_SOURCES = wttest.c
diff --git a/build_posix/Make.base b/build_posix/Make.base
index 28915b77df9..e697697ca39 100644
--- a/build_posix/Make.base
+++ b/build_posix/Make.base
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I build_posix/aclocal
+
 SUBDIRS = . bench/tcbench ext/compressors/bzip2_compress test/format test/insert test/salvage test/thread
 
 wtdir = $(prefix)/wt
@@ -14,12 +16,10 @@ noinst_PROGRAMS = ex_access ex_all ex_call_center ex_config ex_cursor \
 	ex_stat ex_thread ex_tpcb ex_transaction
 
 include_HEADERS= wiredtiger.h
-INCLUDES= -I../src/include
-
-ACLOCAL_AMFLAGS = -I aclocal
+INCLUDES= -I$(srcdir)/src/include
 
-Makefile.am: Make.base makemake ../dist/filelist
-	@sh makemake
+$(srcdir)/build_posix/Makefile.am: $(srcdir)/build_posix/Make.base $(srcdir)/build_posix/makemake $(srcdir)/dist/filelist
+	@cd $(srcdir)/build_posix && sh makemake
 
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status libtool
@@ -27,19 +27,19 @@ libtool: $(LIBTOOL_DEPS)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = wiredtiger.pc
 
-../src/include/extern.h: prototype.chk
+$(srcdir)/src/include/extern.h: prototype.chk
 
 prototype.chk: $(libwiredtiger_la_SOURCES)
-	@(cd ../dist && sh s_prototypes) && touch $@
+	@(cd $(srcdir)/dist && sh s_prototypes) && touch $@
 
 if PYTHON
-PYSRC = ../lang/python
+PYSRC = $(srcdir)/lang/python
 if DEBUG
 PY_SETUP_DEBUG = -g
 endif
 all-local: _wiredtiger.so
 $(PYSRC)/wiredtiger_wrap.c: wiredtiger.h $(PYSRC)/wiredtiger.i
-	@(cd $(PYSRC) && $(SWIG) -python -I../../build_posix wiredtiger.i)
+	@(cd $(PYSRC) && $(SWIG) -python -I$(abs_top_builddir) wiredtiger.i)
 
 _wiredtiger.so: $(wt_LTLIBRARIES) $(PYSRC)/wiredtiger_wrap.c
 	@env CFLAGS="$(PYTHON_CFLAGS)" LDFLAGS="$(PYTHON_LDFLAGS)" \
diff --git a/build_posix/makemake b/build_posix/makemake
index bf4e6d1fb1a..bf54ba2af4b 100644..100755
--- a/build_posix/makemake
+++ b/build_posix/makemake
@@ -11,19 +11,13 @@ set_sources()
 	echo "libwiredtiger_la_LDFLAGS = -release @VERSION@"
 	echo "libwiredtiger_la_SOURCES=\\"
 	sed -e '/^[a-z]/! d' \
-	    -e 's/.*/	..\/& \\/' \
+	    -e 's/.*/	& \\/' \
 	    -e '$s/ \\$//' < $filelist
 }
 
 set_vpath()
 {
-	echo
-	printf "VPATH = ../examples/c:"
-	sed -e '/^[a-z]/! d' \
-	    -e 's/\(.*\)\/.*/\1/' < $filelist |
-	sort -u |
-	while read d ; do printf "../%s:" $d ; done
-	echo "../src/utilities"
+	echo 'VPATH = $(srcdir):$(srcdir)/src/utilities'
 }
 
-(cat Make.base; set_vpath; set_sources) > Makefile.am
+(cat Make.base; set_vpath; set_sources) > ../Makefile.am
diff --git a/build_posix/reconf b/build_posix/reconf
index dc5e0b02421..818e8cb16aa 100644..100755
--- a/build_posix/reconf
+++ b/build_posix/reconf
@@ -10,10 +10,9 @@ trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 clean()
 {
 	test -f Makefile && make distclean > /dev/null
-	rm -rf \
-	    ChangeLog COPYING INSTALL Makefile.am Makefile.in NEWS \
-	    README aclocal.m4 autom4te.cache config.hin config.hin~ \
-	    configure flexlint.out mklog
+	rm -rf ../Makefile.am ../Makefile.in \
+	    ../aclocal.m4 ../autom4te.cache ../config.hin ../config.hin~ \
+	    ../configure flexlint.out mklog
 }
 
 while :
@@ -27,28 +26,25 @@ while :
 	esac
 done
 
-# Initialize standard automake files.
-cp ../LICENSE COPYING
-cat << END > ChangeLog
-To view release and installation documentation, load the distribution
-file docs/index.html into your web browser.
-END
-cp ../README INSTALL
-cat << END > NEWS
-To view release and installation documentation, load the distribution
-file docs/index.html into your web browser.
-END
-cp ../README README
-
 # Build Makefile.am
 sh ./makemake
 
+cd ..
 autoreconf --install
 
 # Make sure any missing files are writable
-chmod 755 gnu-support/*
+chmod 755 build_posix/gnu-support/*
 
 # Cleanup
-rm -rf autom4te.cache config.hin~
+rm -rf ../autom4te.cache
+
+# Initialize standard automake files.
+cp LICENSE COPYING
+cat << END > NEWS
+To view release and installation documentation, load the distribution
+file docs/index.html into your web browser.
+END
+cp NEWS ChangeLog
+cp NEWS INSTALL
 
 exit 0
diff --git a/build_posix/test/salvage/Makefile.am b/build_posix/test/salvage/Makefile.am
deleted file mode 100644
index 52a9fc98d46..00000000000
--- a/build_posix/test/salvage/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/../src/include
-LDADD = -L$(top_builddir) -lwiredtiger
-VPATH = $(top_builddir)/../$(subdir)
-
-noinst_PROGRAMS = t
-t_SOURCES = salvage.c
diff --git a/configure b/configure
deleted file mode 100755
index 353b1a0f983..00000000000
--- a/configure
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Top-level configure script for folks who don't want to read documentation.
-cd build_posix && exec ./configure "$@"
diff --git a/build_posix/configure.ac b/configure.ac
index e57c9731434..8e0fe070496 100644
--- a/build_posix/configure.ac
+++ b/configure.ac
@@ -2,14 +2,14 @@
 #	All rights reserved.
 
 PACKAGE=wiredtiger
-AC_INIT(WiredTiger, m4_normalize(m4_include([aclocal/version.m4])),
+AC_INIT(WiredTiger, m4_normalize(m4_include([build_posix/aclocal/version.m4])),
 	[support@wiredtiger.com])
 
-m4_include([aclocal/version-set.m4])
+m4_include([build_posix/aclocal/version-set.m4])
 
-AC_CONFIG_AUX_DIR([gnu-support])
-AC_CONFIG_MACRO_DIR([aclocal])
-AC_CONFIG_SRCDIR([../dist/RELEASE])
+AC_CONFIG_AUX_DIR([build_posix/gnu-support])
+AC_CONFIG_MACRO_DIR([build_posix/aclocal])
+AC_CONFIG_SRCDIR([dist/RELEASE])
 
 LT_INIT([dlopen])
 AC_SUBST([LIBTOOL_DEPS])
@@ -20,7 +20,7 @@ AC_PROG_CXX(c++ g++)
 AM_INIT_AUTOMAKE
 AM_OPTIONS
 
-AC_CONFIG_HEADERS([wiredtiger_config.h:config.hin])
+AC_CONFIG_HEADERS([wiredtiger_config.h:build_posix/config.hin])
 
 if test "$GCC" = "yes"; then
 	# Automake configures gcc's CFLAGS to be -g -O2.
@@ -96,8 +96,8 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_FILES([
 	Makefile
-	wiredtiger.h:../src/include/wiredtiger.in
-	wt_internal.h:../src/include/wt_internal.in
-	wiredtiger.pc:wiredtiger.pc.in
+	wiredtiger.h:$srcdir/src/include/wiredtiger.in
+	wt_internal.h:$srcdir/src/include/wt_internal.in
+	wiredtiger.pc:$srcdir/build_posix/wiredtiger.pc.in
 ])
 AC_OUTPUT
diff --git a/build_posix/ext/compressors/bzip2_compress/Makefile.am b/ext/compressors/bzip2_compress/Makefile.am
index bae3d576ab1..e1b067b83d1 100644
--- a/build_posix/ext/compressors/bzip2_compress/Makefile.am
+++ b/ext/compressors/bzip2_compress/Makefile.am
@@ -1,6 +1,5 @@
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/../src/include
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
 LDADD = -lbz2
-VPATH = $(top_srcdir)/../$(subdir)
 
 noinst_LTLIBRARIES = bzip2_compress.la
 bzip2_compress_la_SOURCES = bzip2_compress.c
diff --git a/build_posix/ext/compressors/nop_compress/Makefile.am b/ext/compressors/nop_compress/Makefile.am
index f99c3ce3dd0..2f919560201 100644
--- a/build_posix/ext/compressors/nop_compress/Makefile.am
+++ b/ext/compressors/nop_compress/Makefile.am
@@ -1,5 +1,4 @@
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)/../src/include
-VPATH = $(top_srcdir)/../$(subdir)
 
 noinst_LTLIBRARIES = nop_compress.la
 bzip2_compress_la_SOURCES = nop_compress.la
diff --git a/src/btree/col_modify.c b/src/btree/col_modify.c
index 8a2c3b59503..9bd504b0a4d 100644
--- a/src/btree/col_modify.c
+++ b/src/btree/col_modify.c
@@ -103,8 +103,9 @@ __wt_col_modify(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, int is_remove)
 			case WT_PAGE_COL_FIX:
 				new_inslist_size = 1 *
 				    sizeof(WT_INSERT_HEAD *);
-				WT_ERR(__wt_calloc(session,
-				    new_inslist_size, 1, &new_inslist));
+				WT_ERR(__wt_calloc_def(session,
+				    1, &new_inslist));
+				inshead = &new_inslist[0];
 				break;
 			case WT_PAGE_COL_VAR:
 				new_inslist_size = page->entries *
diff --git a/build_posix/test/format/Makefile.am b/test/format/Makefile.am
index 2d85562ad8c..650f3d8f577 100644
--- a/build_posix/test/format/Makefile.am
+++ b/test/format/Makefile.am
@@ -1,7 +1,6 @@
 BDB = $(top_builddir)/db
 INCLUDES = -I$(top_builddir) -I$(BDB)
 LDADD = -L$(top_builddir) -lwiredtiger -L$(BDB)/build_unix -ldb
-VPATH = .:$(top_builddir)/../$(subdir)
 
 noinst_PROGRAMS = t
 t_SOURCES = config.h format.h bdb.c config.c t.c util.c wts.c
diff --git a/build_posix/test/insert/Makefile.am b/test/insert/Makefile.am
index 212a74a6a57..71e461edbc0 100644
--- a/build_posix/test/insert/Makefile.am
+++ b/test/insert/Makefile.am
@@ -1,7 +1,6 @@
 BDB = $(top_builddir)/db
 INCLUDES = -I$(top_builddir) -I$(BDB)
 LDADD = -L$(top_builddir) -lwiredtiger -L$(BDB)/build_unix -ldb
-VPATH = $(top_builddir)/../$(subdir)
 
 noinst_PROGRAMS = t
 t_SOURCES = insert.c
diff --git a/test/salvage/Makefile.am b/test/salvage/Makefile.am
new file mode 100644
index 00000000000..b888d4d4ead
--- /dev/null
+++ b/test/salvage/Makefile.am
@@ -0,0 +1,5 @@
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/include
+LDADD = -L$(top_builddir) -lwiredtiger
+
+noinst_PROGRAMS = t
+t_SOURCES = salvage.c
diff --git a/build_posix/test/thread/Makefile.am b/test/thread/Makefile.am
index d2d3c5b4459..34909c41b27 100644
--- a/build_posix/test/thread/Makefile.am
+++ b/test/thread/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = -I$(top_builddir)
 LDADD = -L$(top_builddir) -lwiredtiger
-VPATH = $(top_builddir)/../$(subdir)
 
 noinst_PROGRAMS = t
 t_SOURCES = thread.h t.c load.c run.c stats.c