diff --git a/auto.def b/auto.def index 8b5306b6e0..4d5f7448bf 100644 --- a/auto.def +++ b/auto.def @@ -817,19 +817,11 @@ proc sqlite-check-line-editing {} { if {"" eq $lnC} { proj-fatal "Cannot find any of $lnCOpts in $dirLn" } - set flavor "" - set lnVal [proj-which-linenoise $lnH] - switch -- $lnVal { - 1 { set flavor "antirez" } - 2 { set flavor "msteveb" } - default { - proj-fatal "Cannot determine the flavor of linenoise from $lnH" - } - } + if {[string match *-ship* $lnC]} {set lnVal 2} {set lnVal 1} define CFLAGS_READLINE "-I$dirLn $lnC" define HAVE_LINENOISE $lnVal sqlite-add-shell-opt -DHAVE_LINENOISE=$lnVal - return "linenoise ($flavor)" + return "linenoise" } elseif {[opt-bool editline]} { # libedit mimics libreadline and on some systems does not have its # own header installed (instead, that of libreadline is used). diff --git a/manifest b/manifest index 497cf46a19..6a24b1bcd7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\smissing\s'close'\scall\sto\sproj-file-content-list. -D 2024-10-31T09:25:58.617 +C The\spresence\sor\sabsence\sof\sthe\slinenoise-ship.c\ssource\sfile\sis\ssufficient\sto\ndifferentiate\sAntirez\slinenoise\sfrom\sMSteveB\slinenoise. +D 2024-10-31T11:04:57.154 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28 @@ -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 cf1acfbbe13d6d041f5a50c8f0db43eb598754081f8f93a7724abfa4a065bf7d +F auto.def b83a0160290baabcf974471a38c73c19e377e7a631ccd2a1483dbce2b09fd4d2 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P babf66f5c7074c24ca8ae898cd850964e99cef41fd1395a0d6c582cab75ae3bf -R 1566d9e697ff519ff3abad2856793988 -U stephan -Z 5342ae504826c884cc1ebd55b932924b +P 005702f334e7c51d83fc1b142ab90fa6867c4c2e75c8a3d2a17e07669b47fb23 +R fb15d83d9d5c7147559cb5dad269c396 +U drh +Z 086c006ebc06aca58461cfd10e4f84dd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3a3317e586..87da9127c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -005702f334e7c51d83fc1b142ab90fa6867c4c2e75c8a3d2a17e07669b47fb23 +28cc77b9167c81ba37c0d8fb93bbf05a62e0a0ceb1039324e03b9eb2403a9e80