database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Undo part of [69e83ab859c], as that order of operations breaks the --prefix=... configure flag. Found a workaround for the library version and OS/environment info being emitted when --help.

Browse Source 
FossilOrigin-Name: cd2a84a72c922c330441d6b75df0c8b2f6df2c25bc7c37ac37046fffd702624a
This commit is contained in:
stephan
2025-02-26 17:11:25 +00:00
parent 68d88cfec5
commit 666bbd4641
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
autosetup/sqlite-config.tcl
View File

@ -13,6 +13,18 @@ if {[string first " " $autosetup(builddir)] != -1} {
}
use proj
# We want this version info to be emitted up front, but we have to
# 'use system' for --prefix=... to work. Ergo, this bit is up here
# instead of in [sqlite-configure].
define PACKAGE_VERSION [proj-file-content -trim $::autosetup(srcdir)/VERSION]
if {"--help" ni $::argv} {
msg-result "Configuring SQLite version [get-define PACKAGE_VERSION]"
}
use system ; # Will output "Host System" and "Build System" lines
if {"--help" ni $::argv} {
msg-result "Source dir = $::autosetup(srcdir)"
msg-result "Build dir = $::autosetup(builddir)"
}
#
# Object for communicating config-time state across various
@ -344,11 +356,6 @@ proc sqlite-configure {buildMode configScript} {
# the most-frequently-useful info at the top of the ./configure
# output, but also avoiding outputing it if --help is used.
uplevel 1 {
define PACKAGE_VERSION [proj-file-content -trim $::autosetup(srcdir)/VERSION]
msg-result "Configuring SQLite version [get-define PACKAGE_VERSION]"
use system ; # Will output "Host System" and "Build System" lines
msg-result "Source dir = $::autosetup(srcdir)"
msg-result "Build dir = $::autosetup(builddir)"
use cc cc-db cc-shared cc-lib pkg-config
}
sqlite-post-options-init