Adjust the "configure" script so that it just disables the ability to

run tests rather than erroring out if tclsh is unable to recommend a
suitable tclConfig.sh.

FossilOrigin-Name: 793ff83d09bea165c8cedc978afd3fcfb1a4cee894c5914aa1d92416afce963d

diff --git a/configure b/configure
index 50d9e2b3d0c7d386cfd443f5f07e3a7e2ddcbbab..5f60385c28d33bdcb65e34d4653553d2687cde86 100755 (executable)
--- a/configure
+++ b/configure
@@ -10330,6 +10330,7 @@ else
   use_tcl=yes
 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
 do
@@ -10388,6 +10389,7 @@ $as_echo "$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&5
 $as_echo "$as_me: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&2;}
+      use_tcl=no
     fi
   fi
 fi
@@ -10438,10 +10440,14 @@ $as_echo "loading TCL configuration from ${tclconfig}" >&6; }
   # tclConfig.sh file and that could be included here.  But as of right now,
   # TCL_LIB_SPEC is the only what that the Makefile uses.
   HAVE_TCL=1
-else
+elif test x"${original_use_tcl}" = "xno"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to run tests because of --disable-tcl" >&5
 $as_echo "unable to run tests because of --disable-tcl" >&6; }
   HAVE_TCL=0
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to run tests because no tclConfig.sh file could be located" >&5
+$as_echo "unable to run tests because no tclConfig.sh file could be located" >&6; }
+  HAVE_TCL=0
 fi
 
 if test x"$TCLSH_CMD" == x; then

diff --git a/configure.ac b/configure.ac
index 4f95a5c08c8d741fd619c2763d3de31d47ec87c4..2936c4ab5a45a337726e2b0c77c4c4c9f84fe135 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,7 @@ AC_ARG_WITH(tclsh, AS_HELP_STRING([--with-tclsh=PATHNAME],[full pathname of a tc
 AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing (tclConfig.sh)]))
 AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[omit building accessory programs that require TCL-dev]),
       [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)
   with_tclsh=${TCLSH_CMD}
@@ -136,6 +137,7 @@ if test x"${with_tclsh}" != x -a x"${with_tclsh}" != xnone; then
       AC_MSG_RESULT([$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}])
     else
       AC_MSG_WARN([$TCLSH_CMD is unable to recommend a tclConfig.sh])
+      use_tcl=no
     fi
   fi
 fi
@@ -185,9 +187,12 @@ if test x"${use_tcl}" = "xyes"; then
   # tclConfig.sh file and that could be included here.  But as of right now,
   # TCL_LIB_SPEC is the only what that the Makefile uses.
   HAVE_TCL=1
-else
+elif test x"${original_use_tcl}" = "xno"; then
   AC_MSG_RESULT([unable to run tests because of --disable-tcl])
   HAVE_TCL=0
+else
+  AC_MSG_RESULT([unable to run tests because no tclConfig.sh file could be located])
+  HAVE_TCL=0
 fi
 AC_SUBST(HAVE_TCL)
 if test x"$TCLSH_CMD" == x; then

diff --git a/manifest b/manifest
index 704cb20843e32b0e7679564fe4d17f027fcc00f8..8b5e68507abd55108176bac060b12f51e9417e86 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\san\s"ifdef"\sthat\sbroke\sSQLITE_OMIT_ANALYZE\sbuilds.
-D 2024-08-17T14:59:26.789
+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
 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 2e5058c2ba2c6b50a01cf50c158180c4ec969b2068c2e361dfbfc875ec3f9d1c x
-F configure.ac b7e26a699a2ffc5eb7a25636f32755c27bbb665777b68ef35a90c1ee9bd9d469
+F configure 956e132a3e2481e5016e9ecaa0a2bdd9df95c1d923fa4fb2aa2cf9f0b3a54ad9 x
+F configure.ac fd9ff064b142682964971fec3d867235e51e1f6de30a031e33f683b7699338ff
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/compile-for-windows.md e8635eea9153dcd6a51fd2740666ebc4492b3813cb1ac31cd8e99150df91762d
@@ -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 7a0cdc7edb704a88a77b748cd28f6e00c49849cc2c1af838b95b34232ecc21f9
-R 501e32d0617414047f040d4ae2e8bb39
-U dan
-Z 4ff808b9d2897218daeb3b1363a873d1
+P c09da26cb6f772a18c595ff0eb55d8345a377c3ef5ed02a5e539ffdbe9d07f85
+R 8082c14d3791ff31a3c70ef600eeef0f
+U drh
+Z 2bdc019c3dd756a5d860815c6dd9a72b
 # Remove this line to create a well-formed Fossil manifest.

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