From ef36ccd1a4dafa6c2bd6b8478264b305e96d13a1 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 12 Jan 2021 14:19:12 +0000 Subject: [PATCH] Fix for the top-level configure script so that it works with tcl 8.7. FossilOrigin-Name: 4810f814ff13db31b95b471d53e9654ecde286c23d10984e3cc8788d79ee79ee --- configure.ac | 6 ++++-- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index ae73a5350e..8a58d3dd33 100644 --- a/configure.ac +++ b/configure.ac @@ -134,8 +134,10 @@ AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin]) if test "x${TCLLIBDIR+set}" != "xset" ; then TCLLIBDIR='$(libdir)' for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do - TCLLIBDIR=$i - break + if test -d $i ; then + TCLLIBDIR=$i + break + fi done TCLLIBDIR="${TCLLIBDIR}/sqlite3" fi diff --git a/manifest b/manifest index 5c6ea5e56e..ee93d18c82 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C New\sCLI\scommand:\s\s".stats\svmstep"\senables\sthe\sdisplay\sof\sthe\svirtual-machine\nstep\scount\sonly,\safter\seach\scommand.\s\sUseful\sfor\soptimization\sproblems. -D 2021-01-09T19:10:04.989 +C Fix\sfor\sthe\stop-level\sconfigure\sscript\sso\sthat\sit\sworks\swith\stcl\s8.7. +D 2021-01-12T14:19:12.264 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -35,7 +35,7 @@ F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 F configure 7736c168f4fd717c8052e58428a89e645d15cf0e5a3d051e248aad859a3cb140 x -F configure.ac efdb70036084ea637226e378a14f932e70c0df9f1bc846a24a909c0e1613524a +F configure.ac 412b65c6107e41c098ad7f5f2e6a3f74ac02ffc6e92b9a6264b9f1060c235a04 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd F doc/lemon.html c5d8ba85ac1daef7be8c2d389899480eb62451ff5c09b0c28ff8157bb8770746 @@ -1895,7 +1895,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 5204c2c4a7b73a64764b0d2d1d7c53709bb64e0d2685a829c7bf31af13bab5e7 -R 08e016b91a617b99baf0add20ffab4d1 -U drh -Z 8b24dd36b9adf4430f5fd36c021c9d5f +P 49dfce469e6a17111b349e53578479daf783064200bf0eec5bf8a91d3553b19f +R 444f6513d1cb519041d3beb5c2993e55 +U dan +Z a232385ce33879f0868385b077fff5a0 diff --git a/manifest.uuid b/manifest.uuid index ad74ba7a76..e050439767 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -49dfce469e6a17111b349e53578479daf783064200bf0eec5bf8a91d3553b19f \ No newline at end of file +4810f814ff13db31b95b471d53e9654ecde286c23d10984e3cc8788d79ee79ee \ No newline at end of file -- 2.47.2