diff --git a/Makefile.in b/Makefile.in
index a89204140b..b4d01f2544 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,11 +63,15 @@ ENCODING = @ENCODING@
 # red/black tree driver in the file btree_rb.c
 #
 # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
-# default to file, 2 to default ot memory, and 3 to force temporary
+# default to file, 2 to default to memory, and 3 to force temporary
 # tables to always be in memory.
 #
-INCOREDB = @INCOREDB@
-INCOREFLAGS = -DSQLITE_OMIT_INMEMORYDB=1 -DTEMP_STORE=${INCOREDB}
+INMEMORYDB = @INMEMORYDB@
+INCOREFLAGS = -DTEMP_STORE=@TEMP_STORE@
+
+ifeq (${INMEMORYDB},0)
+INCOREFLAGS += -DSQLITE_OMIT_INMEMORYDB=1
+endif
 
 # You should not have to change anything below this line
 ###############################################################################
@@ -81,7 +85,8 @@ LIBOBJ = attach.lo auth.lo btree.lo build.lo copy.lo \
          update.lo util.lo vacuum.lo vdbe.lo \
          where.lo trigger.lo
 
-ifeq (${INCOREDB},1)
+# Only build the in-core DB if it is required.
+ifeq (${INMEMORYDB},1)
 LIBOBJ += btree_rb.lo
 endif
 
diff --git a/configure b/configure
index e01428ab23..cb70e94d5e 100755
--- a/configure
+++ b/configure
@@ -467,7 +467,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR ENCODING ALLOWATTACHMEM INCOREDB TEMPDBINCORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TARGET_TCL_LIBS TARGET_TCL_INC TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR ENCODING ALLOWATTACHMEM INMEMORYDB TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TARGET_TCL_LIBS TARGET_TCL_INC TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1434,7 +1434,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.14 $
+# $Revision: 1.15 $
 
 #########
 # Programs needed
@@ -8252,18 +8252,16 @@ if test "${enable_incore_db+set}" = set; then
   enableval="$enable_incore_db"
 
 else
-  enable_incore-db=yes
+  enable_incore_db=yes
 fi;
 echo "$as_me:$LINENO: checking whether to support incore databases for attach and open" >&5
 echo $ECHO_N "checking whether to support incore databases for attach and open... $ECHO_C" >&6
-if test "$enable_incore-db" = "no"; then
-  INCOREDB=0
-  ALLOWATTACHMEM=0
+if test "$enable_incore_db" = "no"; then
+  INMEMORYDB=0
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-  INCOREDB=1
-  ALLOWATTACHMEM=1
+  INMEMORYDB=1
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
@@ -8277,31 +8275,31 @@ if test "${enable_tempdb_in_ram+set}" = set; then
   enableval="$enable_tempdb_in_ram"
 
 else
-  enable_tempdb-in-ram=no
+  enable_tempdb_in_ram=no
 fi;
 echo "$as_me:$LINENO: checking whether to use an in-ram database for temporary tables" >&5
 echo $ECHO_N "checking whether to use an in-ram database for temporary tables... $ECHO_C" >&6
-case "$enable_tempdb-in-ram" in
+case "$enable_tempdb_in_ram" in
   never )
-    TEMPDBINCORE=0
+    TEMP_STORE=0
     echo "$as_me:$LINENO: result: never" >&5
 echo "${ECHO_T}never" >&6
   ;;
   no )
-    INCOREDB=1
-    TEMPDBINCORE=1
+    INMEMORYDB=1
+    TEMP_STORE=1
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
   ;;
   always )
-    INCOREDB=1
-    TEMPDBINCORE=3
+    INMEMORYDB=1
+    TEMP_STORE=3
     echo "$as_me:$LINENO: result: always" >&5
 echo "${ECHO_T}always" >&6
   ;;
   * )
-    INCOREDB=1
-    TEMPDBINCORE=2
+    INMEMORYDB=1
+    TEMP_STORE=2
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ;;
@@ -8309,6 +8307,7 @@ esac
 
 
 
+
 ###########
 # Lots of things are different if we are compiling for Windows using
 # the CYGWIN environment.  So check for that special case and handle
@@ -9927,8 +9926,8 @@ s,@TARGET_RANLIB@,$TARGET_RANLIB,;t t
 s,@TARGET_AR@,$TARGET_AR,;t t
 s,@ENCODING@,$ENCODING,;t t
 s,@ALLOWATTACHMEM@,$ALLOWATTACHMEM,;t t
-s,@INCOREDB@,$INCOREDB,;t t
-s,@TEMPDBINCORE@,$TEMPDBINCORE,;t t
+s,@INMEMORYDB@,$INMEMORYDB,;t t
+s,@TEMP_STORE@,$TEMP_STORE,;t t
 s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t
 s,@OS_UNIX@,$OS_UNIX,;t t
 s,@OS_WIN@,$OS_WIN,;t t
diff --git a/configure.ac b/configure.ac
index 15a4b1b1e0..cb6476c485 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,7 @@ AC_INIT(src/sqlite.h.in)
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.3 $
+# $Revision: 1.4 $
 
 #########
 # Programs needed
@@ -309,15 +309,13 @@ AC_SUBST(ENCODING)
 # Do we want to support in-ram databases for ATTACH DATABASE and sqlite_open
 #
 AC_ARG_ENABLE(incore-db, 
-[  --enable-incore-db           Support incore database],,enable_incore-db=yes)
+[  --enable-incore-db           Support incore database],,enable_incore_db=yes)
 AC_MSG_CHECKING([whether to support incore databases for attach and open])
-if test "$enable_incore-db" = "no"; then
-  INCOREDB=0
-  ALLOWATTACHMEM=0
+if test "$enable_incore_db" = "no"; then
+  INMEMORYDB=0
   AC_MSG_RESULT([no])
 else
-  INCOREDB=1
-  ALLOWATTACHMEM=1
+  INMEMORYDB=1
   AC_MSG_RESULT([yes])
 fi
 AC_SUBST(ALLOWATTACHMEM)
@@ -326,31 +324,32 @@ AC_SUBST(ALLOWATTACHMEM)
 # Do we want temporary databases in memory
 #
 AC_ARG_ENABLE(tempdb-in-ram, 
-[  --enable-tempdb-in-ram     Use an in-ram database for temporary tables],,enable_tempdb-in-ram=no)
+[  --enable-tempdb-in-ram     Use an in-ram database for temporary tables],,enable_tempdb_in_ram=no)
 AC_MSG_CHECKING([whether to use an in-ram database for temporary tables])
-case "$enable_tempdb-in-ram" in
+case "$enable_tempdb_in_ram" in
   never ) 
-    TEMPDBINCORE=0
+    TEMP_STORE=0
     AC_MSG_RESULT([never])
   ;;
   no ) 
-    INCOREDB=1
-    TEMPDBINCORE=1
+    INMEMORYDB=1
+    TEMP_STORE=1
     AC_MSG_RESULT([no])
   ;;
   always ) 
-    INCOREDB=1
-    TEMPDBINCORE=3
+    INMEMORYDB=1
+    TEMP_STORE=3
     AC_MSG_RESULT([always])
   ;;
   * ) 
-    INCOREDB=1
-    TEMPDBINCORE=2
+    INMEMORYDB=1
+    TEMP_STORE=2
     AC_MSG_RESULT([yes])
   ;;
 esac
-AC_SUBST(INCOREDB)
-AC_SUBST(TEMPDBINCORE)
+
+AC_SUBST(INMEMORYDB)
+AC_SUBST(TEMP_STORE)
 
 ###########
 # Lots of things are different if we are compiling for Windows using
diff --git a/manifest b/manifest
index 44564de69b..97c1bcd18f 100644
--- a/manifest
+++ b/manifest
@@ -1,14 +1,14 @@
-C Reset\spCur->eSkip\son\sa\sMoveTo\s(CVS\s922)
-D 2003-04-20T11:41:04
-F Makefile.in df3a4db41a7450468b5fe934d9dd8f723b631249
+C Align\sconfig\svars\scontrolling\sin-memory\sDB\swith\scode\s(CVS\s923)
+D 2003-04-20T11:46:35
+F Makefile.in 004acec253ecdde985c8ecd5b7c9accdb210378f
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION e5b03976c56deafa24511d6ef17d64a28679e9bd
 F aclocal.m4 ff32919e75f42b2d4213fe3c6f79dd0fe47f7769
 F config.guess 831db445a8ae31d1f773fce85e14c16c8677417d
 F config.sub 975368989965310238930ecf8e7f06a23061dbb1
-F configure 21b2d9997812b8134fe6281aca659af23fd92131 x
-F configure.ac 6bd07419ebca8993cd117a2fb58629c2b506d71c
+F configure df43f93754fd81b151e8c6d81b750bf0e9480a8a x
+F configure.ac a158f37fc6b15821406e4d5d4f9a0ed35b8b0e6b
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
@@ -162,7 +162,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 7084e05093e72f6e5b65ff0b574336898396826f
-R c8c3aa1616b589f8a100a47f5c0c5e8a
+P d983accf4a702158f03742fb11959d0fd035a4b4
+R 9c9140e8f7e38e6951b9567de707f4f1
 U paul
-Z cdfdd9c553e34df80f45529e35a33325
+Z e6994638a8674e314247f6f23259eed8
diff --git a/manifest.uuid b/manifest.uuid
index d9262bf968..002ffaad39 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d983accf4a702158f03742fb11959d0fd035a4b4
\ No newline at end of file
+921656db9e3df865aea6b1abe1bc40b1acbeeb47
\ No newline at end of file