From 0b11bcb3e468591ae9a980271ae3b9e07a88a4c8 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 22 Sep 2017 00:24:44 +0000 Subject: [PATCH] Update the configure script so that it looks for tclsh8.7 ahead of tclsh8.6. FossilOrigin-Name: 0a12915b373cd0491a58d8f7a645711c620c70efced623e6b40aa01f23284157 --- configure | 2 +- configure.ac | 2 +- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index ed9ed5ffd4..64b95e912c 100755 --- a/configure +++ b/configure @@ -10304,7 +10304,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.6 tclsh8.5 tclsh +for ac_prog in tclsh8.7 tclsh8.6 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 55ab0673ee..ace5d5d667 100644 --- a/configure.ac +++ b/configure.ac @@ -120,7 +120,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.6 tclsh8.5 tclsh], none) +AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.7 tclsh8.6 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 2ad1b74bd0..c6c2dbee56 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sthe\sWindows\sVFS,\swhen\strying\sto\sopen\sa\sdatabase\sfile\sread/write,\sif\sit\nfails\scheck\sto\ssee\sif\sthe\sfile\sexists\sand\sis\sread-only\sand\simmediately\sfall\nback\sto\sa\sread-only\sopen\sattempt,\srather\sthan\srunning\sthe\sAV\sretry\sloop. -D 2017-09-21T20:43:48.651 +C Update\sthe\sconfigure\sscript\sso\sthat\sit\slooks\sfor\stclsh8.7\sahead\sof\stclsh8.6. +D 2017-09-22T00:24:44.674 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f @@ -30,8 +30,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55 -F configure e691ad9b505f1f47bc5d99be9e1d49b1be9037e9cb3821c9b14c63c3d413d055 x -F configure.ac bb85c1c53e952c8c7078a2f147eba613e0128b8b6e7780d64758d8fb29bcc695 +F configure e9dbb65b61c36bb9622225de254b768d4816749ff4cb4d71307bb067095aceec x +F configure.ac 369ebae6c04d9d2de5064e21d300f2f42f2fbf13235cabff9d1a54f2b2c4d05d F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html 278113807f49d12d04179a93fab92b5b917a08771152ca7949d34e928efa3941 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710 @@ -1655,7 +1655,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P fa3f5bcc23d9342f6df8ea15732988d637e9fa5dade85a73b05a9f66136d6964 -R 9677831c8749fca6b9258075623dae5d +P 5d03c738e93d36815248991d9ed3d62297ba1bb966e602e7874410076c144f43 +R af25328b1412b5532988e49269e8bcab U drh -Z d25f7e57106bd66e6a2a3d4c1e5b9c3e +Z d8a9f78bca4ad7573c0a5dc3ae2ffff1 diff --git a/manifest.uuid b/manifest.uuid index d08d756e8b..d2fde797c5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5d03c738e93d36815248991d9ed3d62297ba1bb966e602e7874410076c144f43 \ No newline at end of file +0a12915b373cd0491a58d8f7a645711c620c70efced623e6b40aa01f23284157 \ No newline at end of file