Add missing exports of various LDFLAGS and CFLAGS for the teaish build.

FossilOrigin-Name: 7462b1c66e8b3799ba1d73a1b815993e1c511ac0b7263e747ca0186d263ad001

5 files changed, 58 insertions, 13 deletions

diff --git a/autoconf/tea/autosetup/teaish-core.tcl b/autoconf/tea/autosetup/teaish-core.tcl
index 48babe84c..25c17276f 100644
--- a/autoconf/tea/autosetup/teaish-core.tcl
+++ b/autoconf/tea/autosetup/teaish-core.tcl
@@ -721,18 +721,34 @@ proc teaish__append_stuff {def args} {
   }
 }
 
-# @teaish-add-cflags cflags...
+# @teaish-add-cflags ?-define? cflags...
+#
 # Appends all non-empty $args to TEAISH_CFLAGS
+#
+# If -define is used then each flag is assumed to be a [define]'d
+# symbol name and [get-define X ""] used to fetch it.
 proc teaish-add-cflags {args} {
+  set isdefs 0
+  if {[lindex $args 0] in {-d -define}} {
+    set args [lassign $args -]
+    set xargs [list]
+    foreach arg $args {
+      lappend xargs [get-define $arg ""]
+    }
+    set args $xargs
+  }
   teaish__append_stuff TEAISH_CFLAGS {*}$args
 }
 
-# @teaish-add-cflags ?-p|-prepend? ldflags...
+# @teaish-add-cflags ?-p|-prepend? ?-define? ldflags...
 #
 # Appends all non-empty $args to TEAISH_LDFLAGS unless the first
 # argument is one of (-p | -prepend), in which case it prepends all
 # arguments, in their given order, to TEAISH_LDFLAGS.
 #
+# If -define is used then each argument is assumed to be a [define]'d
+# flag and [get-define X ""] is used to fetch it.
+#
 # Typically, -lXYZ flags need to be in "reverse" order, with each -lY
 # resolving symbols for -lX's to its left. This order is largely
 # historical, and not relevant on all environments, but it is
@@ -740,8 +756,29 @@ proc teaish-add-cflags {args} {
 #
 # See: teaish-prepend-ldflags
 proc teaish-add-ldflags {args} {
-  if {[lindex $args 0] in {-p -prepend}} {
-    set args [lassign $args -]
+  set prepend 0
+  set isdefs 0
+  set xargs [list]
+  foreach arg $args {
+    switch -exact -- $arg {
+      -p - -prepend { set prepend 1 }
+      -d - -define {
+        set isdefs 1
+      }
+      default {
+        lappend xargs $arg
+      }
+    }
+  }
+  set args $xargs
+  if {$isdefs} {
+    set xargs [list]
+    foreach arg $args {
+      lappend xargs [get-define $arg ""]
+    }
+    set args $xargs
+  }
+  if {$prepend} {
     lappend args {*}[get-define TEAISH_LDFLAGS ""]
     define TEAISH_LDFLAGS [join $args]; # join to eliminate {} entries
   } else {
diff --git a/autoconf/tea/teaish.tcl b/autoconf/tea/teaish.tcl
index d4a43f46f..0f3a4ad47 100644
--- a/autoconf/tea/teaish.tcl
+++ b/autoconf/tea/teaish.tcl
@@ -106,6 +106,13 @@ proc teaish-configure {} {
   sqlite-handle-math
   sqlite-handle-icu
   sqlite-handle-common-feature-flags
+
+  teaish-add-ldflags -d \
+    LDFLAGS_LIBICU LDFLAGS_LIBMATH LDFLAGS_DLOPEN \
+    LDFLAGS_LIBRT LDFLAGS_LIBZ
+
+  teaish-add-cflags -define CFLAGS_LIBICU OPT_FEATURE_FLAGS
+
 }; # teaish-configure
 
 
diff --git a/manifest b/manifest
index 52f98dd46..e3003ce86 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sout-of-tree\sbuild\sfor\sautoconf/tea.
-D 2025-04-12T02:44:02.397
+C Add\smissing\sexports\sof\svarious\sLDFLAGS\sand\sCFLAGS\sfor\sthe\steaish\sbuild.
+D 2025-04-12T03:08:13.139
 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 3d5d66ae83704330662f48165b5f8d914640ffdb5d6910c98c6499ec87404563
+F autoconf/tea/autosetup/teaish-core.tcl 3e2ebf01d65e111c57ab0fb5ebad8a74459820976bbff1b609261e52a09388ee
 F autoconf/tea/autosetup/teaish-feature-tests.tcl 4f641aff23eb364d5483dbd2122e070ea279059cab17e24b8108598c2b5f4457
 F autoconf/tea/autosetup/teaish-tester.tcl 6ea18f15260db28961581599de6b675b5118e86da1511b5e5bffdcbbc8d3b42c
 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 12a05b5763b6eb3d312c826844e6d21b7695373afc9afa473c6edcadaf2b53b5
+F autoconf/tea/teaish.tcl 241824df34b1439df433e505bc302076a672487665c7519be27efefed7462271
 F autoconf/tea/teaish.tester.tcl.in 743fd0fe1e667f82fd8fc3ebe0a5c77763e4dbed7bbc8605a9d4b1d0663dac78
 F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
 F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e
@@ -2151,7 +2151,7 @@ F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a
-F tool/mkautoconfamal.sh 9947a17b6ce7eac3f139be4d4a0b9e8a1672c3fd0a2b870a48ddfb3f6461c094
+F tool/mkautoconfamal.sh 3e9ff23d3f63ccc82097022208859ff961faf7f171041695b369b9443fb907dc
 F tool/mkccode.tcl c42a8f8cf78f92e83795d5447460dbce7aaf78a3bbf9082f1507dc71a3665f3c x
 F tool/mkctimec.tcl f76dbfc74cefad8d126384ba3263677939f077bd184fcdf8c592a1daf64f50c3 x
 F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
@@ -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 95227341cf290ca6f20b5ff7e707a28b59f87784947425c3fd1d8e5e7eb878a4
-R 3cc3ff6fd9dc8c1dc6e629ff46b63fc4
+P 955b516618a34eac69da25fc7405015701a72f3cb918fca0cda7d316f6c3db9a
+R 48e7957df92ab14c3490cd95c8142140
 U stephan
-Z 2ea84868f01b833ad43bece152510791
+Z 8897e2da99fcd312c2d10a48bd959303
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5dd05b4d0..37d9203cb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-955b516618a34eac69da25fc7405015701a72f3cb918fca0cda7d316f6c3db9a
+7462b1c66e8b3799ba1d73a1b815993e1c511ac0b7263e747ca0186d263ad001
diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index 8d104c020..7c9ee06a7 100644
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -87,6 +87,7 @@ EOF
 cat  $TOP/src/tclsqlite.c           >> tea/generic/tclsqlite3.c
 
 find . -type f -name '*~' -exec rm -f \{} \;
+
 ./configure && make dist
 tar xzf sqlite-$VERSION.tar.gz
 mv sqlite-$VERSION $TARBALLNAME