Commit Graph

755 Commits

Author SHA1 Message Date
stephan
e32a50a025 Teach configure --editline to report itself to shell.c as either HAVE_EDITLINE or HAVE_READLINE, depending on which headers are available (editline/readline.h or readline/readline.h, both of which work and some systems only have the latter), but then link against libedit regardless of which one shell.c thinks it is using.
FossilOrigin-Name: 85077b20e69ed269f8840bb900e823981bebd82063853fbf178b1af44a6951ba
2024-10-29 08:01:56 +00:00
stephan
7097105bea Remove LDFLAGS_LIBZ from sqlite3.pc.in (pkg-config) because it's not needed by the library, only the shell. Re-enable the notice about --disable-static only being partially true.
FossilOrigin-Name: e03c564aff6e3ac558f17670bfdd5fc129a8d33ec50975af843973152483e3fa
2024-10-29 04:21:11 +00:00
stephan
a94ca1d37c Remove some dead auto.def code. Link tclsqlite3 shell against the .so instead of .a, analog to [45315f8f275d]. Move some header file tests which are only needed for jimsh into the jimsh compilability check block.
FossilOrigin-Name: 9a259026ae2dce5d60b80bd7d662a6e73734e51056f4a4226c3fa5ac636b5e3a
2024-10-29 03:29:45 +00:00
stephan
4824b9c664 Minor makefile formatting cleanups. No functional changes.
FossilOrigin-Name: 10b2cfdccd06553752baf684ccd7f4f85a697e3f0f6dfc5e5dda6b231fa4352d
2024-10-28 18:41:42 +00:00
stephan
51d5aa0915 Calculate TCLLIBDIR in the makefile targets which use it, rather than via the configure script. This enables its use in static makefiles.
FossilOrigin-Name: 6b1494cecb48535b909f8a48ccb56e147221601380a1457ff85ab861fa576ea1
2024-10-28 18:30:46 +00:00
drh
bc4df6079c Remove the never-used and never-documented and long-ago deprecated
user-authentication feature option.

FossilOrigin-Name: 3a3f7bf4307c27e56546e51da06ecc9a262cdf155fda2dd359aa2326d207a147
2024-10-28 17:27:15 +00:00
stephan
fe5602ffd9 Perform some makefile acrobatics to get the tclConfig.sh state applied for static makefiles.
FossilOrigin-Name: 9b141d108b64c8f4e1103de6f142d972b5151eed0f07988fea308fc71cec45b8
2024-10-28 17:20:18 +00:00
drh
42516b2ef9 Omit the antiquated and long-unsupport async extension since it has been
superseded by WAL mode for over a decade.

FossilOrigin-Name: 10b1b86821bfc21377e7ccceb31146ab01aa6eaf418b85a204abcab5b793958e
2024-10-28 15:38:53 +00:00
drh
8625bd64c2 Omit ext/consio from the tree. No longer needed or supported.
FossilOrigin-Name: 1ce8507f732a26508a9b336cb27756a0a8638e14395efdd59b5faef40526ede5
2024-10-28 14:53:45 +00:00
stephan
1a466a386e Link libtclsqlite3.so to libsqlite3.so, not libsqlite3.a.
FossilOrigin-Name: 45315f8f275db6059bdff7a8269014f06a793debd90675ac877f3a6f5c6ba4a4
2024-10-28 14:24:36 +00:00
stephan
e550d98bbf Expand the 'make help' target and clean up some overly-noisy configure output.
FossilOrigin-Name: c895766ed31f55c02f05d357333e9cf45e82ec5af4d8b0491270e4fda7a57d42
2024-10-27 22:34:07 +00:00
stephan
3a92a5c4b3 Re-order the auto.def flags logical groups. Add some discrete bold formatting to select configure output. Remove some dead code. Account for behavior misunderstanding of user-notice. Add the start of a 'make help' target. General cosmetic cleanups.
FossilOrigin-Name: ab95ee33dfe56bd3b223f978626e6014414881c30443a2b88c782de724c39ae1
2024-10-27 22:18:33 +00:00
stephan
6c45a5d60e Re-add the --disable-static flag to (mostly) disable static lib build. Some components require the static lib and will trump this preference if they are activated.
FossilOrigin-Name: e296cd11a2bd87bffc9c661baea6539c0258b5e9cf3e9bc516f07c758b3e5939
2024-10-27 08:52:20 +00:00
stephan
e2a4ec3921 Ensure that --disable-tcl is honored. Move LDFLAGS.icu from the CLI shell target to LDFLAGS.libsqlite3.
FossilOrigin-Name: 39ce3f6350d811f27e5104e3dd01de2b04ce2a36edcbefd08596b8ca6c6226ff
2024-10-27 08:10:56 +00:00
stephan
1fa0ef3ae8 Get --with-linenoise=DIR configure flag working.
FossilOrigin-Name: 66ce47e5de21c607d2ef1f1e6e639f3c6da132ff3db582e12bd174f7d89d8150
2024-10-26 21:51:04 +00:00
stephan
26068b7901 Remove the install-lib makefile dep from install-tcl, as it breaks non-root-user invocations of 'make install-tcl' when the --prefix is left at its default and --with-tcl is explicitly provided.
FossilOrigin-Name: e7eabfb61f72dc396fab9d0671642f8150cde23aea965c5e77ac3d9ad11c749f
2024-10-26 19:16:18 +00:00
stephan
ccb1211b54 Patch bundle accumulated via /chat: add missing --enable/disable-shared flag to configure script and update testrunner.tcl for other configure script flag changes.
FossilOrigin-Name: 32fc9c3f62601684b4ded783a79ebf817d093588c87ece02b449c3542881b65a
2024-10-26 16:03:04 +00:00
drh
26d5652b56 Fix a bug in the computation of LDFLAGS.libsqlite3 introduced by [63218898ed0a6d46].
FossilOrigin-Name: 58373d523cece0b39a29edcccecf93cfdc7ac68f9f12130ee8e487675d3f6a4d
2024-10-26 11:18:29 +00:00
stephan
8ee82c6202 Add missing B.exe extension to src-verify, as reported in the forum.
FossilOrigin-Name: 2801fb6507fc98730449168f3cf49495690e634c004c7074b4d45a0bd7513d41
2024-10-26 04:31:04 +00:00
stephan
dac467890e Doc typo fix.
FossilOrigin-Name: da50e85d9a2020f4c59a72d6ae775fa32c275f0d5086c3caf9b13ab0a937fe1f
2024-10-26 03:30:18 +00:00
stephan
bf441f7575 Rephrase 'older' as 'legacy' in the docs from [0a50e33051] and [2b2ca7dec18d].
FossilOrigin-Name: d212cc36824acd490a0afd8bc393159612075438b9f3fab992deec9d78d8a366
2024-10-26 03:22:44 +00:00
stephan
56d46d9d38 Expand the libtool-style link support from [0a50e33051] such that if INSTALL_SO_086_LINKS=1 is passed to 'make install' then the libtool-style names are always linked in, regardless of whether they already existed or not. In either case, we unconditionally remove libsqlite3.la because it cannot work with the newly-installed non-libtool .so file.
FossilOrigin-Name: 2b2ca7dec18d6b53ba7810a2ecf3937d98b5b08232d4f82d16fa2ad5f9fd83b2
2024-10-26 03:19:29 +00:00
stephan
65d83fa221 Disable generation of config.defines.json until/unless it proves interesting. Honor the --disable-largefile flag. When installing libsqlite3.so and an older-style libtool installation is found, re-link the libtool-generated files to the newly-installed ones to retain their historical names.
FossilOrigin-Name: 0a50e33051fbdd5b7b7f0ab7eb2b2561d259098075fa8847868017041d789484
2024-10-26 03:05:20 +00:00
stephan
a2d88f6a03 Correct unresolved @LIBS@ placeholder in sqlite3.pc.in.
FossilOrigin-Name: 63218898ed0a6d466a282f10819d51a7f480d8f12316b74ee8a3f402fcc4e927
2024-10-25 23:45:05 +00:00
stephan
895ad5f4af Rename VERSION_XYZ to the more conventional PACKAGE_VERSION and remove the unused VERSION_XY.
FossilOrigin-Name: 2d2f6dfdebbaba181d0ac16b5b0fa63490fb4c4bdb5ee2e8bf70f06ec862a77f
2024-10-25 22:44:58 +00:00
drh
35660cb5a6 Restore the amalgamation-tarball and snapshot-tarball targets, at least for
now.

FossilOrigin-Name: 1baf4b948854cb4f7c509395df4520a04c16c10cf9e4b67e73e26118636b3204
2024-10-25 14:36:23 +00:00
stephan
72ef506925 Back out [bd66222721] because it causes conflicts with test runs, apparently due to .o files being built with different flags. This means that the CLI shell currently does not honor --disable-amalgamation.
FossilOrigin-Name: b063317352e1360293787909cafe46dbfda68a75a89c6559bac69ad160d5ec43
2024-10-24 14:33:11 +00:00
stephan
e3565d9424 Minor makefile tweaks to account for customizations via a custom hand-built makefile.
FossilOrigin-Name: 7f92e820e675ea5d54284c534d44ec4f7f242b30920a5f84c020b93f2e7e969d
2024-10-24 12:57:45 +00:00
stephan
2ba8b9566f Fix the sqlite3(.EXE) build to honor --disable-amalgamation.
FossilOrigin-Name: bd66222721ad06e99c1b66a3a0fbde06532507aa067165f47fa5d6c41ba630e6
2024-10-24 12:03:02 +00:00
stephan
4cd85bda4a Various build cleanups centered around straightening out various uses of CFLAGS and its cousins. Teach Makefile.linux-generic to figure out the TOP dir on its own (a GNU Make-ism, but it's a Linux-specific makefile).
FossilOrigin-Name: 58a0f7e79ce913b432dfd4db018e5a92efa8a6bd8a50bd78ab705ceac0322e9c
2024-10-24 07:31:39 +00:00
stephan
30b20563e4 More potentially-controversial makefile symbol renaming. This is simply more readable to my eyes.
FossilOrigin-Name: 6d4d1d5fefb82ec7458efc2e93c933d9dc415dfa06fa46ff4725c30fc920ca5a
2024-10-24 05:33:30 +00:00
stephan
caf8c28420 Potentially controversial/unconventional makefile symbol renamings and docs explaining them.
FossilOrigin-Name: 7eceb7539dcce16104a93ad0ca1f755f23621751878cc4b01465e61333795b72
2024-10-24 04:56:44 +00:00
stephan
ce236e031e Generic build cleanups.
FossilOrigin-Name: be7b32a77f58ae3eb15cb828385035e63236b7e6c0669f90f2321f0509f0de1b
2024-10-24 04:34:39 +00:00
stephan
e74c738e55 Get Makefile.linux-generic (formerly Makefile.linux-gcc) working with jimsh in out-of-tree builds. Pass on -DHAVE_READLINE=1 to the sqlite3 shell if configure detects it.
FossilOrigin-Name: a555ff6dbc2ded5a9c65c8ef483f3197298848a580dda25ba0b721ba13167ad4
2024-10-24 03:50:40 +00:00
stephan
8c97ad8834 General make cleanups. Start adding a sanity-check mechanism to main.mk which does basic validation of the vars it expects to be set by the file which includes it. Get Makefile.linux-gcc working for the core-most rules.
FossilOrigin-Name: 85b2c73ccb85d7f5830a6fac692b380c5c79e7a54ee3fc6fc37343fa23816ef8
2024-10-24 03:14:40 +00:00
stephan
4dadb531b0 Rename some build vars for legibility. Fix hwaci-make-from-dot-in when the input file list is multi-line.
FossilOrigin-Name: fdb584421578cae825365d457cd533721839e3503f3744c77832c5925815b537
2024-10-24 01:26:50 +00:00
stephan
e615b73040 Fix out-of-tree builds configured with --disable-amalgamation.
FossilOrigin-Name: 182dac1c46f8ada2e1f3abd4959ac72f0ecfd451b41fbe699f5077f338ae7d62
2024-10-24 00:02:44 +00:00
stephan
284e70b3a1 Add missing export of LDFLAGS_DLOPEN to Makefile.in.
FossilOrigin-Name: d18af84bf76db16513791b43850c41dbb5a83c435b8d3e93afaa8c2920460ac7
2024-10-23 15:05:08 +00:00
stephan
31465666ff Bring checksymbols target up to date and add a TODO based on a feature request from the forum.
FossilOrigin-Name: c00a03256b3f06411f93e690f875e9bc59a750aeea3ecf84bf8c8bec7c08b8ae
2024-10-21 22:15:04 +00:00
stephan
744d986d17 Resolve two build FIXMEs.
FossilOrigin-Name: 4de51c165ca4d0ad66f5dd7aa16fc82c673c6791b65990339134fb26b858ec33
2024-10-21 21:32:58 +00:00
stephan
7968c38540 Get most of the numerous misc tool binaries building.
FossilOrigin-Name: fa74cbb40c0f2e0135ac97fc4fa899b2ab7973f925f154e8e18c85661d60e17f
2024-10-21 21:22:18 +00:00
stephan
ad8e79ce53 Simplify how the targets which may or may not be enabled, depending on config flags, are formulated in main.mk.
FossilOrigin-Name: 7bea793ce46ab5c41b242c5e69b4f9bd8536a9b106e8c39f7ac002451d5db6ea
2024-10-21 20:12:03 +00:00
stephan
5bae363b99 More build doc tweaks and get ./startup building.
FossilOrigin-Name: cee285029c7225a2457062eb2b4ea7c6a17a3a5ba5fb776ebbb4ea8be62b9fff
2024-10-21 19:51:32 +00:00
stephan
b124098e51 Start moving most Makefile.in docs over to main.mk. Fix compilation of tclsqlite.c.
FossilOrigin-Name: 5b154e08ab5e8a8fd1ac1b28debd46824ef55b533a60ca5711c55b5a59a871cd
2024-10-21 17:50:55 +00:00
stephan
f9c73ef7c5 Generic build cleanups and reorgs.
FossilOrigin-Name: 365a3d71cf9e0be11e7b3e90b6500142619102d8321c1d6f8111f37117a57929
2024-10-20 01:09:51 +00:00
stephan
003d304c9b More build cleanups and get it working with BSD make (which apparently does not support $< and behaves slightly differently than gmake with X?=Y).
FossilOrigin-Name: dcf4fc78fb2813d37eb56c358009f1e5225f28a0c85c710c8127db330efaf319
2024-10-19 20:53:46 +00:00
stephan
25557128fe Move most of the makefile code into the static main.mk.
FossilOrigin-Name: 09905ed094f7102dbb4fc81b059452c50b48b0f3a2bd9736bed364b0639d89d7
2024-10-19 20:26:17 +00:00
stephan
abf470d7a3 Factor out all autosetup-processed @if/@else blocks from Makefile.in in prep for moving most of the makefile code into main.mk (which has, so far, been completely overlooked in this port but will now become the main basis for the static parts of the build). The idea is that all build configuration goes into a platform-dependent makefile which then includes main.mk.
FossilOrigin-Name: 707e0f5857d58ec8b457270f988126b1dd0f01b5a3445a43ff7b5429324b1b3d
2024-10-19 18:31:47 +00:00
drh
f578ce102e Change the name of the new utility program from sqlite3-rsync to
sqlite3_rsync - dash changed to underscore - for consistency with the
preexisting sqlite3_analyzer.

FossilOrigin-Name: 86e794cbaa5ae600635c933b46298a39f2465daf4c5cd1570f2a03e19ac08d9d
2024-10-16 11:05:11 +00:00
drh
a55901a27c Port sqldiff over to use sqlite3_stdio.
FossilOrigin-Name: 18f784c47d4252bc3696a7e084a1afb9f51f006cf2021292f2103531b8235226
2024-09-24 17:40:54 +00:00