Hard fail the ./configure script if it is unable to find a working tclsh.

[forum:/forumpost/4380363682708ece|Forum post 4380363682708ece].

FossilOrigin-Name: 9f6402831b8add6f4f17b50a370c5dc217e57765c3122cff3247aed026d8519e

diff --git a/configure b/configure
index 7b31f6f7e8c5aff4e4820444857bb113817442ce..8cb1060fb5b7b37ba7f3a90da14bf68a4a762095 100755 (executable)
--- a/configure
+++ b/configure
@@ -10362,11 +10362,16 @@ done
 test -n "$TCLSH_CMD" || TCLSH_CMD="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.
-  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
-  USE_AMALGAMATION=0
-  TCLSH_CMD="tclsh"
+  echo 'ERROR: SQLite requires tclsh to build from canonical sources.'
+  echo 'Use the alternative "amalgamation tarball" distribution to build'
+  echo 'without using tclsh.  Note, however, that the amalgmatation'
+  echo 'tarball does not contain all of the build targets that this'
+  echo 'package supports.  If you want to build everything associated'
+  echo 'with SQLite (such as runnings tests or building auxiliary tools'
+  echo 'like "sqldiff" or "sqlite3_analyzer") then you really do need'
+  echo 'to install tclsh version 8.5 or later.'
+  echo 'ERROR: configure failed'
+  exit 1
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 837d2fb015c3ceb0d04013059e7de03faea26ec3..f0a3f61e8526366510e631b50c6cdee30b34f6f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,11 +122,16 @@ USE_AMALGAMATION=1
 # 
 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.
-  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
-  USE_AMALGAMATION=0
-  TCLSH_CMD="tclsh"
+  echo 'ERROR: SQLite requires tclsh to build from canonical sources.'
+  echo 'Use the alternative "amalgamation tarball" distribution to build'
+  echo 'without using tclsh.  Note, however, that the amalgmatation'
+  echo 'tarball does not contain all of the build targets that this'
+  echo 'package supports.  If you want to build everything associated'
+  echo 'with SQLite (such as runnings tests or building auxiliary tools'
+  echo 'like "sqldiff" or "sqlite3_analyzer") then you really do need'
+  echo 'to install tclsh version 8.5 or later.'
+  echo 'ERROR: configure failed'
+  exit 1
 fi
 AC_SUBST(TCLSH_CMD)
 

diff --git a/manifest b/manifest
index 678a86c22fedd0bed9b89883f3b01adff50c3bfa..0ce25880432e5ebf5b5f86d6663b51896be7f671 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JNI:\swhen\sfetching\stext-or-blob/length\spairs,\sfetch\sthe\stext-or-blob\sfirst,\sthen\sthe\slength,\sas\sthe\sAPI\sdocs\ssuggest.
-D 2023-10-02T17:12:16.304
+C Hard\sfail\sthe\s./configure\sscript\sif\sit\sis\sunable\sto\sfind\sa\sworking\stclsh.\n[forum:/forumpost/4380363682708ece|Forum\spost\s4380363682708ece].
+D 2023-10-04T11:04:39.717
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -33,8 +33,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 1d9cbcb416cb5387b3f750ae6db63cfedb703a2e46bf8ca61daecff31d208252 x
-F configure.ac de31fea7d975bb7ebafbe0e2190a855cc80d48558bf0c9a6578a1836daf1cd3a
+F configure 2ac086dd8bffa576089c0a8f75af304094719cba7fecae16cd0f7a3bcabdd41c x
+F configure.ac 5092357d657ef4da8e1e67235e3acd8a2bc1027d82fd85d9c134fda8ae113241
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/compile-for-windows.md c52f2903f1cb11b2308798feecca2e44701b037b78f467a538ac5c46c28ee250
@@ -2122,8 +2122,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 325243226520376f4a142864ae3fb98866f25bff4dc50a6b648ef98428a7169f
-R 46fa2dcc5034c47ceb71e3721ad57fae
-U stephan
-Z c507ea20def3bb46f7fb137790b2fa35
+P e4f9d3946fa570bccea2de17c5536901bdabd46cfe25678fdd37ba0e2bfd99b1
+R d01bf1b2e7fc9ce8ecd6e5e851bf5ef8
+U drh
+Z ee27c5df12a3814afda93f06e6c58bba
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 308d4d77e2ecbd60b56016addd06c501777130b9..a5f8e7e5a151aa10793d1ffabcb4a51ff4d98b27 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4f9d3946fa570bccea2de17c5536901bdabd46cfe25678fdd37ba0e2bfd99b1
\ No newline at end of file
+9f6402831b8add6f4f17b50a370c5dc217e57765c3122cff3247aed026d8519e
\ No newline at end of file