Update the makefiles to prefer TCL version 8.5 instead of 8.4.

FossilOrigin-Name: 8118de2af33557f75b4f2f1b1194a21d46ccf7fe

diff --git a/Makefile.arm-wince-mingw32ce-gcc b/Makefile.arm-wince-mingw32ce-gcc
index d1ca389dc39ad9ad02fbaae1f3855ee1bd0565e1..323b7ea482f4929621c2f4d8ac749e175ea4c92f 100644 (file)
--- a/Makefile.arm-wince-mingw32ce-gcc
+++ b/Makefile.arm-wince-mingw32ce-gcc
@@ -103,15 +103,15 @@ SHPREFIX =
 #
 #TCL_FLAGS =
 #TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.4linux
-#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
+TCL_FLAGS = -I/home/drh/tcltk/8.5linux
+#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
 #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
 
 #### Linker options needed to link against the TCL library.
 #
 #LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
-#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
+LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
+#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
 
 #### Additional objects for SQLite library when TCL support is enabled.

diff --git a/Makefile.linux-gcc b/Makefile.linux-gcc
index 2bb618489a660302cb52e29a88da13dc1270a5ec..1c9f24f4baf710a5f27ae553f463a4e6aa4bdad5 100644 (file)
--- a/Makefile.linux-gcc
+++ b/Makefile.linux-gcc
@@ -93,15 +93,15 @@ SHPREFIX = lib
 #
 #TCL_FLAGS =
 #TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.4linux
-#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
+TCL_FLAGS = -I/home/drh/tcltk/8.5linux
+#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
 #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
 
 #### Linker options needed to link against the TCL library.
 #
 #LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
-#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
+LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
+#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
 
 #### Additional objects for SQLite library when TCL support is enabled.

diff --git a/Makefile.vxworks b/Makefile.vxworks
index b3f648e2080c6d181b0f1680e449bf17683ae931..993e5579590f944773172cdaee191d8d97b9b9b3 100644 (file)
--- a/Makefile.vxworks
+++ b/Makefile.vxworks
@@ -110,15 +110,15 @@ SHPREFIX = lib
 #
 #TCL_FLAGS =
 #TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.4linux
-#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
+TCL_FLAGS = -I/home/drh/tcltk/8.5linux
+#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
 #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
 
 #### Linker options needed to link against the TCL library.
 #
 #LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
-#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
+LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
+#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
 
 #### Additional objects for SQLite library when TCL support is enabled.

diff --git a/configure b/configure
index 6928721ad51a5840d1358dbe7fae9ac14081cea5..e0c7fa0c007b48a535063a0018cb0a5f771e3780 100755 (executable)
--- a/configure
+++ b/configure
@@ -12259,7 +12259,7 @@ USE_AMALGAMATION=1
 # if not, then we fall back to plain tclsh.
 # TODO: try other versions before falling back?
 #
-for ac_prog in tclsh8.4 tclsh
+for ac_prog in tclsh8.5 tclsh
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

diff --git a/configure.ac b/configure.ac
index 441cf7808cedb8b126de5fcddebfacb4962d7ef1..ea8c23f5116504c0b736d23b3fe15a887acd9f9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ USE_AMALGAMATION=1
 # if not, then we fall back to plain tclsh.
 # TODO: try other versions before falling back?
 # 
-AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none)
+AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.5 tclsh], none)
 if test "$TCLSH_CMD" = "none"; then
   # If we can't find a local tclsh, then building the amalgamation will fail.
   # We act as though --disable-amalgamation has been used.

diff --git a/manifest b/manifest
index 5047de77d5f16c2760615ebfeab5a37768a096ab..3a65142d27e6564c94dd394b4c0ed443d9b70270 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sa\sbug\sin\sthe\sSQLITE_STATUS_MALLOC_COUNT\scounter.\s\sAdd\san\sALWAYS()\saround\na\scondition\sin\sthe\sSQLITE_DBSTATUS_SCHEMA_USED\slogic\sthat\sis\salways\strue.
-D 2010-07-26T19:09:32
-F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
+C Update\sthe\smakefiles\sto\sprefer\sTCL\sversion\s8.5\sinstead\sof\s8.4.
+D 2010-07-27T16:42:23
+F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
-F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
-F Makefile.vxworks 4314cde20a1d9460ec5083526ea975442306ae7e
+F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
+F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION ddbfd1d7e557883fe2fd646cffe46c28cebcff48
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -24,8 +24,8 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure c7e2aee57206205b4c7c0811b3d055570d95421f x
-F configure.ac 14740970ddb674d92a9f5da89083dff1179014ff
+F configure e0e4abf2b1a2c53a3b46e9ee9eb859fad58df4c4 x
+F configure.ac 699040cc9abb7465dca5a2972bc89d227fd8f734
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
@@ -841,14 +841,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8f8e442b3af553753e25c304efa289b626e3a227
-R 5371a85b2515d99b31bc6a1e384719ad
+P 6df081adbfa581c477bd2c96bb3f7f44be131a8f
+R 2e30ee83ed26c6b6d858b65a1a40368a
 U drh
-Z 87f1a64358a92f9d6ead03c3021e38e6
+Z 7c9b71a765785eb5366a775431acbda9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMTd1voxKgR168RlERAmvEAJ9Dgn0OTr0OmSVFUH3d22Y+JTDFdACeJ8b1
-r/VI49yVB7hY03oBNs8YaCk=
-=iNp6
+iD8DBQFMTwxyoxKgR168RlERAoWhAKCIJmTkn9tifBBxLWcZZSTjSKv7hQCghz7k
+L9/hegUPu/Ry2mCj4VCVOlE=
+=kcSH
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 05b7f6ce62f000b1920b4e2dbacbee3cc17e9613..c1bb427adf8ec57ce7236eb10660c3c2b0593c20 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6df081adbfa581c477bd2c96bb3f7f44be131a8f
\ No newline at end of file
+8118de2af33557f75b4f2f1b1194a21d46ccf7fe
\ No newline at end of file