From: stephan <stephan@noemail.net>
Date: Fri, 14 Feb 2025 17:52:57 +0000 (+0000)
Subject: Simplify the --help workaround introduced in [6a21d6a2ed].
X-Git-Tag: major-release~284
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0c987967f9b94eb08c0f1b202fbed079c3f5d42;p=thirdparty%2Fsqlite.git

Simplify the --help workaround introduced in [6a21d6a2ed].

FossilOrigin-Name: b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2
---

diff --git a/auto.def b/auto.def
index 455b246e09..8a964ad75c 100644
--- a/auto.def
+++ b/auto.def
@@ -17,9 +17,7 @@ use sqlite-config
 if {0} {
   sqlite-config-bootstrap canonical
 } else {
-  set sq3options [sqlite-config-bootstrap canonical]
-  options $sq3options
-  unset sq3options
+  options [sqlite-config-bootstrap canonical]
   sqlite-post-options-init
 }
 sqlite-setup-default-cflags
diff --git a/autoconf/auto.def b/autoconf/auto.def
index 7e154caa32..ccbaaa89ee 100644
--- a/autoconf/auto.def
+++ b/autoconf/auto.def
@@ -11,9 +11,7 @@ use sqlite-config
 if {0} {
   sqlite-config-bootstrap autoconf
 } else {
-  set sq3options [sqlite-config-bootstrap autoconf]
-  options $sq3options
-  unset sq3options
+  options [sqlite-config-bootstrap autoconf]
   sqlite-post-options-init
 }
 sqlite-check-common-bins
diff --git a/manifest b/manifest
index ec9077572f..4ae8152a9e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\sa\sautosetup\s--help\sbug\swhich\sonly(?)\striggers\son\stcl\s8.6,\sintroduced\sby\s[9978c87139b7b042]\sand\sreported\supstream\sas\s[https://github.com/msteveb/autosetup/issues/73|ticket\s#73].\sSummary:\scalling\s'options'\sfrom\sa\sproc,\sinstead\sof\sthe\sglobal\sscope,\striggers\san\serror\sabout\san\sinvalid\suse\sof\s'break'.
-D 2025-02-14T17:21:05.787
+C Simplify\sthe\s--help\sworkaround\sintroduced\sin\s[6a21d6a2ed].
+D 2025-02-14T17:52:57.730
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def 559f8f904a63950fcbe8d5692141ea4e5bf6b1e38ffb25b89a572d829d8ea648
+F auto.def 6120063c2901500ee7ff662dee63f234fe24e546c9c0292c3fcb3beb9c2e59f5
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
 F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715
 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
-F autoconf/auto.def ef517ef2bb4445b0df5644ef06ba414538192f6e62ad4c03f56d8041a9a78d88
+F autoconf/auto.def c160516ad490b00fad64235323ff18323a6a6523607d2a9705f2ec38ea2f5c33
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@ -2207,8 +2207,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 ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416
-R f4836849041855b59c987e999995c2b8
+P 6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39
+R ccbb8a55e81df7376a41b6d85d79a9b1
 U stephan
-Z 3d0710da40d3f26ab6ec370f0db703f9
+Z 440d189d3f6211449eb539edd8ee3916
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 67eb80d7f6..47d8d4598b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39
+b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2