0
0
mirror of https://github.com/sqlite/sqlite.git synced 2024-11-24 08:07:42 +01:00

Change --enable-tempstore to --with-tempstore to avoid the uphill (and losing) battle with autosetup's built-in handling of the --enable/--disable prefixes.

FossilOrigin-Name: 8bea45fbbf8557760e792cdfcede72afa9e25dd7b90e4ce3297efebe8d0cfb1c
This commit is contained in:
stephan 2024-09-25 12:16:13 +00:00
parent 2d0b1ae73b
commit aaef970446
3 changed files with 15 additions and 12 deletions

View File

@ -54,7 +54,11 @@ set enable_shared 1
# error, is to define both {tempstore=1} and {enable-tempstore:}. With
# that in place --enable-tempstore, with no value, works as expected
# (why? Nobody knows!) but --tempstore can only ever be legally passed
# a boolean value (0, 1, yes, no, enabled, disabled).
# a boolean value (0, 1, yes, no, enabled, disabled). It does,
# however, pollute the --help with a synthetic --disable-tempstore
# option. After an hour of fighting with it, a switch from
# --enable-tempstore to --with-tempstore seems like the better
# approach, in that it doesn't lead to a losing fight with autosetup.
options {
with-tclsh:PATHNAME => {Full pathname of tclsh to use}
with-tcl:DIR => {Directory containing tclConfig.sh}
@ -62,8 +66,7 @@ options {
test-status => {Enable status of tests}
threadsafe=1 => {Disable mutexing}
releasemode => {libtool link to release mode}
tempstore=1 => {}
enable-tempstore: => {Use an in-ram database for temporary tables: never,no,yes,always}
with-tempstore:=no => {Use an in-ram database for temporary tables: never,no,yes,always}
editline=0 => {BSD editline support}
readline=0 => {readline support}
with-readline-lib => {readline library}
@ -493,7 +496,7 @@ if {0} {
##########
# Do we want temporary databases in memory
if {1} {
set ts [opt-val enable-tempstore no]
set ts [opt-val with-tempstore no]
set tsn 1
msg-checking "Use an in-ram database for temporary tables? "
switch -- $ts {
@ -502,7 +505,7 @@ if {1} {
yes { set tsn 2 }
always { set tsn 3 }
default {
user-error "Invalid enable-tempstore value \[$ts]. Use one of: no, yes, always, never"
user-error "Invalid with-tempstore value \[$ts]. Use one of: no, yes, always, never"
}
}
msg-result $ts

View File

@ -1,5 +1,5 @@
C Baby\ssteps\stowards\sa\sworking\sauto.def.
D 2024-09-25T08:04:14.465
C Change\s--enable-tempstore\sto\s--with-tempstore\sto\savoid\sthe\suphill\s(and\slosing)\sbattle\swith\sautosetup's\sbuilt-in\shandling\sof\sthe\s--enable/--disable\sprefixes.
D 2024-09-25T12:16:13.024
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 eb236b4f17149ff8ce2a5dcd68f3f0b9c349fd1c063975e808279cdd376a6ff6
F auto.def 46adeff81937896526e074fb26dad88f482f44ab4577468a43da73304158d357
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 fe6fa4ce5271c6265985574e1c406dda5b57f0dc360626800b6173a8f054bdab
R 63e04f82879526ec975f0378b679f11b
P c223dbb4fb8e800089752617c6c986b6c80be0d180e9d1610f28cf95253e5674
R 780005d9a0ea48859fdd0440470d05eb
U stephan
Z ab45cc0c2e7401e955c33f04a9ab6c02
Z 67206b818d975312f9c5773e94dde53e
# Remove this line to create a well-formed Fossil manifest.

View File

@ -1 +1 @@
c223dbb4fb8e800089752617c6c986b6c80be0d180e9d1610f28cf95253e5674
8bea45fbbf8557760e792cdfcede72afa9e25dd7b90e4ce3297efebe8d0cfb1c