From: stephan <stephan@noemail.net>
Date: Sat, 12 Apr 2025 02:44:02 +0000 (+0000)
Subject: Correct out-of-tree build for autoconf/tea.
X-Git-Tag: major-release~102^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71b7e44869b5cb42d2299bd13247a9c52357d1e6;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 955b516618a34eac69da25fc7405015701a72f3cb918fca0cda7d316f6c3db9a
---

diff --git a/autoconf/tea/autosetup/teaish-core.tcl b/autoconf/tea/autosetup/teaish-core.tcl
index ecc614e4c0..48babe84c8 100644
--- a/autoconf/tea/autosetup/teaish-core.tcl
+++ b/autoconf/tea/autosetup/teaish-core.tcl
@@ -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]} {
diff --git a/autoconf/tea/configure b/autoconf/tea/configure
index 82751815f9..47378126f5 100755
--- a/autoconf/tea/configure
+++ b/autoconf/tea/configure
@@ -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" \
+                                   "$@"
diff --git a/autoconf/tea/teaish.tcl b/autoconf/tea/teaish.tcl
index ba56680878..d4a43f46f7 100644
--- a/autoconf/tea/teaish.tcl
+++ b/autoconf/tea/teaish.tcl
@@ -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]"
diff --git a/manifest b/manifest
index 43049f23e0..52f98dd469 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sport\sof\sthe\sTEA\sbuild\s(autoconf/tea)\sfrom\sautotools\sto\sautosetup.
-D 2025-04-12T02:30:04.750
+C Correct\sout-of-tree\sbuild\sfor\sautoconf/tea.
+D 2025-04-12T02:44:02.397
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -26,14 +26,14 @@ F autoconf/tea/Makefile.in 9ca3a7ccbeda98aaf4d48582905f00b7c3b30c0c2843383dc4424
 F autoconf/tea/README.txt 656d4686c509d375f5988ff3deda94f65fe6cd8358cd55d1f1dcc7b6e2ff73aa
 F autoconf/tea/auto.def 0ee2afbdbf5289fb5ab06d8c4cc9cd6fa8cdd173cf0db962bbb66212c8dc5106
 F autoconf/tea/autosetup/README.txt 17dd4cfae6094b3c239c7ad0a437b13162481e72c60243ba482d180e34314024
-F autoconf/tea/autosetup/teaish-core.tcl 401488767f6caeb69c2fc5133e783a8ee69675a0a295c3333f8a1dcdfe59bfc3
+F autoconf/tea/autosetup/teaish-core.tcl 3d5d66ae83704330662f48165b5f8d914640ffdb5d6910c98c6499ec87404563
 F autoconf/tea/autosetup/teaish-feature-tests.tcl 4f641aff23eb364d5483dbd2122e070ea279059cab17e24b8108598c2b5f4457
 F autoconf/tea/autosetup/teaish-tester.tcl 6ea18f15260db28961581599de6b675b5118e86da1511b5e5bffdcbbc8d3b42c
-F autoconf/tea/configure 80438748ef71927f0d42f3e3db2df62a7a5d1eb65be3944ea589184d269d903e x
+F autoconf/tea/configure d0b12b984edca6030d1976375b80157ac78b5b90a5b4f0dcee39357f63f4a80b x
 F autoconf/tea/doc/sqlite3.n 4499e2b556710dd4f9ea76a0bb35bd9616769dc4d33858213b075de8f6334872
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in ea13b90006ef3f1205f46fbd382736fe2f364caa644cc8e958c83a78ac7fa1d1
-F autoconf/tea/teaish.tcl ea6b73ebe5849fe0e2bc7a1877a18da6c003e255554e5b22c1fea16bba6d1439
+F autoconf/tea/teaish.tcl 12a05b5763b6eb3d312c826844e6d21b7695373afc9afa473c6edcadaf2b53b5
 F autoconf/tea/teaish.tester.tcl.in 743fd0fe1e667f82fd8fc3ebe0a5c77763e4dbed7bbc8605a9d4b1d0663dac78
 F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
 F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e
@@ -2215,8 +2215,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 a6cbc5db1c4973ea236874bd9c24cd86dc48fbc7a10e424896c0407c7c32ce6a
-R f3d207dbee46dba15a1c65b83e43fe61
+P 95227341cf290ca6f20b5ff7e707a28b59f87784947425c3fd1d8e5e7eb878a4
+R 3cc3ff6fd9dc8c1dc6e629ff46b63fc4
 U stephan
-Z c1cf051277bbad0070552a6d2485794b
+Z 2ea84868f01b833ad43bece152510791
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fdac3fe06c..5dd05b4d04 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95227341cf290ca6f20b5ff7e707a28b59f87784947425c3fd1d8e5e7eb878a4
+955b516618a34eac69da25fc7405015701a72f3cb918fca0cda7d316f6c3db9a