Re-enable the --enable-all bits after figuring out that autosetup(options) is not...

FossilOrigin-Name: beb2a12045447586cc74f243d4f519c967595d929abe6330c2b1049897e8eaad

diff --git a/auto.def b/auto.def
index 13daca806c94bcfac564c347aa08583b2d5011e4..9693371d9fdfae3007eb02b099b170f6f6782a5c 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -140,20 +140,14 @@ proc add-feature-flag {flag} {
 
 ########################################################################
 # Force-set autosetup option $flag to $val.
-#
-# BUG: dies with "missing value to go with key, which indicates an arg
-# count error to [dict exists]. Why it does that is a mystery, though.
-proc opt-bool-set {flag {val 1}} {
+proc opt-set {flag {val 1}} {
   global autosetup
-  #puts "DEBUG: opt-bool-set $flag $val. DICT=<<$::autosetup(options)>>"
-  if {![dict exists $::autosetup(options) $flag]} {
+  if {$flag ni $::autosetup(options)} {
     # We have to add this to autosetup(options) or else future calls
     # to [opt-bool $flag] will fail validation of $flag.
-    dict set ::autosetup(options) $flag {}
+    lappend ::autosetup(options) $flag
   }
   dict set ::autosetup(optset) $flag $val
-  #puts "DEBUG: opt-bool-set $flag $val = [opt-bool $flag]"
-  #puts "DEBUG: opt-bool-set $flag $val = [dict get $::autosetup(optset) $flag]"
 }
 
 ########################################################################
@@ -405,19 +399,15 @@ if {0} {
 # XXX fi
 # XXX AC_SUBST BUILD_CC
 
-#opt-bool-set why-does-this-puke
-#if-enabled all {
-#  opt-bool-set fts4
-#  opt-bool-set fts5
-#  opt-bool-set geopoly
-#  opt-bool-set rtree
-#  opt-bool-set session
-#}
-
-#if-enabled geopoly {opt-bool-set rtree}
-#if {[opt-bool geopoly]} {
-#  opt-bool-set rtree
-#}
+if-enabled all {
+  opt-set fts4
+  opt-set fts5
+  opt-set geopoly
+  opt-set rtree
+  opt-set session
+} {
+  if-enabled geopoly {opt-set rtree}
+}
 
 
 ##########

diff --git a/manifest b/manifest
index d251b6a1439b3fe1fa5a252f79abfacf82ad3ee6..30811fa47f57ad3f504e8d3fbfaebdb7d0f6699c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\swith\s--enable-all\sbits,\sas\sthe\shelper\sfunction\sit\suses\sis\sdying\sfor\sreasons\sbeyond\smy\smeager\stcl-fu.
-D 2024-09-25T06:07:54.339
+C Re-enable\sthe\s--enable-all\sbits\safter\sfiguring\sout\sthat\sautosetup(options)\sis\snot\sa\sdict,\sbut\sa\slist.
+D 2024-09-25T06:25:33.251
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -14,7 +14,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def b40b43d5a875219ce95e4f79e2af2e94dda6794499191be2f40bfee2c83f5a7e
+F auto.def 612211379b4bad517472ffdc7844787ae717555779ba5d4daf91ded4e3580b33
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2232,8 +2232,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 9752768d8a83052cb69fa07d51e2c82e710c20482cc02c33a4412ffdfa3dc699
-R 0eddc38894d4661d5c3724c85feb2c7f
+P d2b883120e7ab374092d2bdef0faa22eaa9639cb103f9fbbbbfd16639fbfd323
+R 6c833ff96fca19f682fd2f436027b582
 U stephan
-Z feae9d13f636f6426ad2f0979409e029
+Z 12d89494d4ba08947638b55ca875c9aa
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f89887f0418295c8a985492c509d5300cfc3f181..084298881a8c3d5f78cec86e1eed9d9f56392e44 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2b883120e7ab374092d2bdef0faa22eaa9639cb103f9fbbbbfd16639fbfd323
+beb2a12045447586cc74f243d4f519c967595d929abe6330c2b1049897e8eaad