Adjust Makefile.in so that it outputs a slightly better error message on an

attempt to build something that requires TCL libraries when HAVE_TCL is false.

FossilOrigin-Name: a4043cbeb8a08fca2fdd2ea703e030d3a5574cc6002292ecc6f0e88c116472a3

diff --git a/Makefile.in b/Makefile.in
index 7ff6e901e49ecdc9209b7ebbd3e6234d3fa18559..44665184fc17784aad4eeaaff26c6b5984a8982a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -796,6 +796,10 @@ has_tclsh85:
        sh $(TOP)/tool/cktclsh.sh 8.5 $(TCLSH_CMD)
        touch has_tclsh85
 
+has_tclconfig:
+       @ if test x"$(HAVE_TCL)" != "x1"; then  echo 'ERROR: Requires access to "tclConfig.sh" which "configure" was not able to locate'; exit 1; fi
+       touch has_tclconfig
+
 
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
@@ -1118,7 +1122,7 @@ tclsqlite-shell.lo:       $(TOP)/src/tclsqlite.c $(HDR)
 tclsqlite-stubs.lo:    $(TOP)/src/tclsqlite.c $(HDR)
        $(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
 
-tclsqlite3$(TEXE):     tclsqlite-shell.lo libsqlite3.la
+tclsqlite3$(TEXE):     has_tclconfig tclsqlite-shell.lo libsqlite3.la
        $(LTLINK) -o $@ tclsqlite-shell.lo \
                 libsqlite3.la $(LIBTCL)
 
@@ -1305,7 +1309,7 @@ TESTFIXTURE_SRC1 = sqlite3.c
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
 TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
 
-testfixture$(TEXE):    has_tclsh85 $(TESTFIXTURE_SRC)
+testfixture$(TEXE):    has_tclconfig has_tclsh85 $(TESTFIXTURE_SRC)
        $(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
                -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
 
@@ -1404,13 +1408,13 @@ shelltest: $(TESTPROGS)
 sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in has_tclsh85
        $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
 
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+sqlite3_analyzer$(TEXE): has_tclconfig sqlite3_analyzer.c
        $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
 
 sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in has_tclsh85
        $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
 
-sqltclsh$(TEXE): sqltclsh.c
+sqltclsh$(TEXE): has_tclconfig sqltclsh.c
        $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
 
 sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
@@ -1429,7 +1433,7 @@ CHECKER_DEPS =\
 sqlite3_checker.c:     $(CHECKER_DEPS) has_tclsh85
        $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
 
-sqlite3_checker$(TEXE):        sqlite3_checker.c
+sqlite3_checker$(TEXE):        has_tclconfig sqlite3_checker.c
        $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
 
 dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo

diff --git a/manifest b/manifest
index 8b5e68507abd55108176bac060b12f51e9417e86..bd4f4cbe1c8243e70a301da27c2311ed0b0fdebc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Adjust\sthe\s"configure"\sscript\sso\sthat\sit\sjust\sdisables\sthe\sability\sto\nrun\stests\srather\sthan\serroring\sout\sif\stclsh\sis\sunable\sto\srecommend\sa\nsuitable\stclConfig.sh.
-D 2024-08-17T15:52:21.666
+C Adjust\sMakefile.in\sso\sthat\sit\soutputs\sa\sslightly\sbetter\serror\smessage\son\san\nattempt\sto\sbuild\ssomething\sthat\srequires\sTCL\slibraries\swhen\sHAVE_TCL\sis\sfalse.
+D 2024-08-17T16:17:16.045
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in cf96aa7d2682650dec56dc2f03cfe463feb101a1be594e4929bcd38662bc2ea8
+F Makefile.in 209e9c64edf499b0ea7a15448699101c01d15828af35a3439d32fc25fdf1b787
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 6c3fe8b6ce60e73f34a148c957d78b4648745c8d30e792423aa1a8d8bf12d065
 F README.md 6358805260a03ebead84e168bbf3740ddf3f683b477e478567186aa7afb490d3
@@ -2205,8 +2205,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 c09da26cb6f772a18c595ff0eb55d8345a377c3ef5ed02a5e539ffdbe9d07f85
-R 8082c14d3791ff31a3c70ef600eeef0f
+P 793ff83d09bea165c8cedc978afd3fcfb1a4cee894c5914aa1d92416afce963d
+R be5ece8b231f01bec02cbe9ef4eda884
 U drh
-Z 2bdc019c3dd756a5d860815c6dd9a72b
+Z 6d429e685f531219ca0d0afba9760eb7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1e3ae45cbc43cd7371962a5816a38746c2f27e9b..a5034c9d32f62b33da47b3afde724178e9d39b72 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-793ff83d09bea165c8cedc978afd3fcfb1a4cee894c5914aa1d92416afce963d
+a4043cbeb8a08fca2fdd2ea703e030d3a5574cc6002292ecc6f0e88c116472a3