database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Correct out-of-tree build for autoconf/tea.

Browse Source 
FossilOrigin-Name: 955b516618a34eac69da25fc7405015701a72f3cb918fca0cda7d316f6c3db9a
This commit is contained in:
stephan
2025-04-12 02:44:02 +00:00
parent 19b0701087
commit 71b7e44869
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoconf/tea/autosetup/teaish-core.tcl
View File

@ -633,7 +633,7 @@ proc teaish__find-extension {} {
# We use the first one we find in the builddir or srcdir.
#
if {"" eq $extT} {
set flist [list $dext/teaish.tcl];# $dsrc/teaish.tcl]
set flist [list $dext/teaish.tcl $dsrc/teaish.tcl]
if {![proj-first-file-found $flist extT]} {
if {"--help" in $::argv} {
return 0
@ -665,7 +665,7 @@ use --teaish-extension-dir=/path/to/extension"
# the builddir or the srcdir.
#
if {"" eq $extM} {
set flist [list $dext/teaish.make.in];# $dsrc/teaish.make.in]
set flist [list $dext/teaish.make.in $dsrc/teaish.make.in]
proj-first-file-found $flist extM
}
if {"" ne $extM && [file readable $extM]} {

7
autoconf/tea/configure vendored
View File

@ -1,4 +1,7 @@
#!/bin/sh
dir="`dirname "$0"`/../autosetup"
dir0="`dirname "$0"`"
dirA="$dir0/../autosetup"
# This is the case ^^^^^^^^^^^^ in the SQLite "autoconf" bundle.
WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@"
WRAPPER="$0"; export WRAPPER; exec "`"$dirA/autosetup-find-tclsh"`" \
"$dirA/autosetup" --teaish-extension-dir="$dir0" \
"$@"

4
autoconf/tea/teaish.tcl
View File

@ -7,7 +7,7 @@ define TEAISH_LOAD_PREFIX Sqlite3; # 2nd arg to [load]
#
# Get the version...
#
define TEAISH_VERSION [proj-file-content -trim ../VERSION]
define TEAISH_VERSION [proj-file-content -trim [get-define TEAISH_DIR]/../VERSION]
proj-assert {[string match 3.*.* [get-define TEAISH_VERSION]]}
#
@ -72,7 +72,7 @@ proc teaish-configure {} {
set srcdir [get-define TEAISH_DIR]
teaish-add-src -dist -dir generic/tclsqlite3.c
teaish-add-cflags -I.. ; # for sqlite3.c
teaish-add-cflags -I${srcdir}/.. ; # for sqlite3.c
if {[proj-opt-was-provided override-sqlite-version]} {
define TEAISH_VERSION [opt-val override-sqlite-version]
msg-result "NOTICE: overriding version number: [get-define TEAISH_VERSION]"