From: stephan <stephan@noemail.net>
Date: Tue, 25 Feb 2025 16:11:25 +0000 (+0000)
Subject: Restructure [826bad10e9ccd6f71e] as that structure mysteriously breaks the --prefix... 
X-Git-Tag: major-release~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3d2ec228911bf7215aa514ba3df8483f8e2801c;p=thirdparty%2Fsqlite.git

Restructure [826bad10e9ccd6f71e] as that structure mysteriously breaks the --prefix=... configure flag.

FossilOrigin-Name: d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index e6dfb018d2..8cfa7ff68e 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -28,6 +28,8 @@ proc sqlite-setup-package-info {} {
   msg-result "Source dir = $srcdir"
   msg-result "Build dir  = $::autosetup(builddir)"
 }
+sqlite-setup-package-info
+use cc cc-db cc-shared cc-lib pkg-config
 
 #
 # Object for communicating config-time state across various
@@ -355,14 +357,6 @@ proc sqlite-configure {buildMode configScript} {
     dict incr opts -level
     return {*}$opts $msg
   }
-  sqlite-setup-package-info
-  uplevel 1 {
-    # The odd placement of this block is so that we can emit the
-    # output from sqlite-setup-package-info after --help is processed
-    # but before any other info is emitted, e.g. the host/target
-    # system info and the C compiler check.
-    use cc cc-db cc-shared cc-lib pkg-config
-  }
   sqlite-post-options-init
   uplevel 1 $configScript
   sqlite-configure-finalize
diff --git a/manifest b/manifest
index 4c076a42b3..8c63190f2a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\shelp\savoid\sproblems\sin\sthe\sCLI\swhen\strying\sdisplay\scontent\nthat\scontains\sANSI\sescape\scodes:\s\s(1)\sAdd\sthe\s--escape\sMODE\soption\sto\sthe\sCLI\nwhere\sMODE\sis\sone\sof\s"symbol",\s"ascii",\s"off"\swhere\sthe\sdefault\sis\s"symbol".\n(2)\sAdd\sthe\sunistr()\sSQL\sfunction.\s\s(3)\sAdd\sthe\sunistr_quote()\sSQL\sfunction.\n(4)\sAdd\sthe\s%#Q\sand\s%#q\sconversions\sin\sthe\sbuilt-in\sprintf.
-D 2025-02-25T15:57:49.285
+C Restructure\s[826bad10e9ccd6f71e]\sas\sthat\sstructure\smysteriously\sbreaks\sthe\s--prefix=...\sconfigure\sflag.
+D 2025-02-25T16:11:25.004
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e
-F autosetup/sqlite-config.tcl c9ec1c6f34c3998c9eb0757f6e23a11de4f1e56db64becbdba0aa331e86f2312
+F autosetup/sqlite-config.tcl f0f65115fc1102b6c07c92b068c880f53609979f42997c875cd26b41ded18ee4
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2213,9 +2213,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 85b56fb0cce4b628f80b26a67b43236ef1557282775739bdbe7cc4d65948d66f 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476
-R c94972830506b6b395965daf9af442ac
-T +closed 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476
-U drh
-Z 631ba5f922f8bda01c5446d2ca5a70ab
+P e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0
+R fd4ebe752142efbb8ac5cd30b48aab12
+U stephan
+Z efa68ac0882424e3130ad8b6fbb82f0b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3d240e7aee..3bbb70f315 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0
+d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c