Change the makefile to prefer the use of tclsh9.0 if it is available.

FossilOrigin-Name: 28e2b9a23f61530bc5eea364a74817fca03fa31f70d4eefb0942a89c1d79f765

diff --git a/configure b/configure
index 22b961e554aca8a1c3e8d20a3a9dced2a3905968..0ddfa67aa620fb5022406545f4c78e714758ab5b 100755 (executable)
--- a/configure
+++ b/configure
@@ -10335,7 +10335,7 @@ fi
 
 original_use_tcl=${use_tcl}
 if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
-  for ac_prog in tclsh8.6 tclsh tclsh9.0
+  for ac_prog in tclsh9.0 tclsh8.6 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 b3a0dd299f15f97dbb9e73a7cb8dfffd539e242c..f2ec22aae2f308ed11a17dfd437d950390da0624 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[omit building accessory progr
       [use_tcl=$enableval],[use_tcl=yes])
 original_use_tcl=${use_tcl}
 if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
-  AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.6 tclsh tclsh9.0],none)
+  AC_CHECK_PROGS(TCLSH_CMD, [tclsh9.0 tclsh8.6 tclsh],none)
   with_tclsh=${TCLSH_CMD}
 fi
 if test x"${with_tclsh}" != x -a x"${with_tclsh}" != xnone; then

diff --git a/manifest b/manifest
index ed9d25983e46b235b5e0ab2000a54c3675021fc3..7367c76fefa26edf0a3433b52a324c9485374c50 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sit\sso\sthat\sthe\sTCL\sextension\sinstalled\susing\s"make\sinstall"\shas\sthe\nsame\sname\sas\sthe\sone\sinstalled\sby\s"make\stclextension-install".
-D 2024-10-09T13:40:49.112
+C Change\sthe\smakefile\sto\sprefer\sthe\suse\sof\stclsh9.0\sif\sit\sis\savailable.
+D 2024-10-09T13:54:24.437
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -35,8 +35,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc 7b3bb2ef32ade0f3f14d951231811678722725e3bca240dd9727ae0dfe10f6a5
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 49523f0a070b583cea040d26eff53a65fb0893eca4663b1343a4d5a9a964da53 x
-F configure.ac a100ebf7a07f5dedd319ef547dd467d1676ed059b85a7877aa9c44ac309f7000
+F configure 135e050689ea244477582e6d77cc7867dfcfe6e0f82e3eab3e47655a67035f8f x
+F configure.ac aca8ebf47b7644c473e11e599ea986eeb23860a8732a8812039ad961ef52a713
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/compile-for-windows.md 4d4bfafda42a7a33f166d23aed4db1bb4ea1e5751595a5cced2bad349fd14652
@@ -2216,8 +2216,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9c0690193200551a3218c576b19eaf40e330dc252d67b430204ff44495e4793e
-R 923d4cd7cb78af9845370c2fe6b3cf93
+P e21fc1ba44dc88547fd2cdfaed90717566153880e79d862e2b3e54ba7f8f0a2e
+R 43a3ec8b90a9e71d80fbd60d9b6497e3
 U drh
-Z 3a79948d3d4fb197913c1113a9a14bc7
+Z cb990e9dc67b861b1e4007698e41b060
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a5401ff882d1b9c115fc1fd3e27150785eeae8b0..13363666791661205cec0fd80da112a30f62aff0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e21fc1ba44dc88547fd2cdfaed90717566153880e79d862e2b3e54ba7f8f0a2e
+28e2b9a23f61530bc5eea364a74817fca03fa31f70d4eefb0942a89c1d79f765