0
0
mirror of https://github.com/sqlite/sqlite.git synced 2024-11-25 00:49:41 +01:00

Have --enable-editline fail rather than emit a warning which would easily be overlooked by automated builds. The error message explains a potential workaround for activating libedit.

FossilOrigin-Name: 2bd1b9557a1619adcaf5aa6dc5d5d0972e8416dafc9f36621b409192be95223d
This commit is contained in:
stephan 2024-10-28 02:11:51 +00:00
parent 36cb4d03ac
commit 5a6dc86df2
4 changed files with 27 additions and 15 deletions

View File

@ -776,13 +776,14 @@ proc sqlite-check-line-editing {} {
# --enable-editline to do exactly that but it seems likely to
# break on systems for which which HAVE_EDITLINE=1 previously
# worked.
hwaci-indented-notice {
WARNING: the --enable-editline flag is not supported due to
hwaci-indented-notice -error {
ERROR: the --enable-editline flag is not supported due to
non-availability of systems which have it in a form which the
sqlite3 CLI shell expects to see. On some systems this can be
worked around by passing --with-readline-ldflags=-ledit instead of
--enable-editline, which will attempt to use the readline.h
supplied by libreadline but link against -ledit.
worked around by passing --with-readline-ldflags=-ledit instead
of --enable-editline, which will attempt to use the readline.h
supplied by libreadline but link against -ledit. On systems
tested so far, that works.
}
return "none"
} elseif {![opt-bool readline]} {

View File

@ -75,11 +75,22 @@ proc hwaci-bold {str} {
# using [user-notice] (which means its rendering will (A) go to stderr
# and (B) be delayed until the next time autosetup goes to output a
# message).
proc hwaci-indented-notice {msg} {
set lines [split $msg \n]
#
# If its first argument is -error then it renders the message
# immediately and then exits.
proc hwaci-indented-notice {args} {
set fErr ""
switch -exact -- [lindex $args 0] {
-error { set args [lassign $args fErr] }
}
set lines [split [join $args] \n]
foreach line $lines {
user-notice " [string trimleft $line]"
}
if {"" ne $fErr} {
show-notices
exit 1
}
}
########################################################################

View File

@ -1,5 +1,5 @@
C Docs\sand\ssmall\scode\scleanups\sin\shwaci-common.tcl.
D 2024-10-28T01:13:00.918
C Have\s--enable-editline\sfail\srather\sthan\semit\sa\swarning\swhich\swould\seasily\sbe\soverlooked\sby\sautomated\sbuilds.\sThe\serror\smessage\sexplains\sa\spotential\sworkaround\sfor\sactivating\slibedit.
D 2024-10-28T02:11:51.336
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@ -13,7 +13,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 a876018881cc52bd5ac45015d460164fa0c5bc0c92bb820aee3b49c3f38d1394
F auto.def 33b45a5d8a51f0f8a211c8983c1c7306120a672f4c37dccf8b3e4c343c8d4569
F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@ -47,7 +47,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
F autosetup/hwaci-common.tcl 0cf12e082cc5045eba20aa323d5139bd3893a2cedcecdccbc8331b069c783d43
F autosetup/hwaci-common.tcl 064900a2e7512e6e1ce9f25bb74d6850574d294b026885f0329dbe69585407dd
F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@ -2237,8 +2237,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 64f33bb125102b3fec3901f4b56098429509ec0b6ce6e6b88af2393c344ac864
R b9a4b55e0b90ed0b1b286d5c8ffe18f5
P 1353d4b600ae2849d2591b3fba0cad71289ee996334222a6886dc01cd4be5c07
R c5d541f8ce498a3c24d538d7cf4698ef
U stephan
Z 103ccefab8e9ee7baf6989214f50afc6
Z 8668cf4e3948e2d9e4ce3d2e5557772d
# Remove this line to create a well-formed Fossil manifest.

View File

@ -1 +1 @@
1353d4b600ae2849d2591b3fba0cad71289ee996334222a6886dc01cd4be5c07
2bd1b9557a1619adcaf5aa6dc5d5d0972e8416dafc9f36621b409192be95223d