Latest upstream autosetup for a --help fix on QNX.

FossilOrigin-Name: b9faebbb543fb3a03f46dd4defe28ffa0c32a9a46ed73912f93b86e41f3db04a

diff --git a/autosetup/autosetup b/autosetup/autosetup
index e041e77a3a086ccf701b77fb78ba2832864a8850..90f5454b5ffd43358832cd397a2fb2b6ab4a4674 100755 (executable)
--- a/autosetup/autosetup
+++ b/autosetup/autosetup
@@ -566,7 +566,10 @@ proc options-show {what} {
        set indent [string repeat " " [expr {$max+4}]]
        set cols [getenv COLUMNS 80]
        catch {
-               lassign [exec stty size] rows cols
+               lassign [exec stty size] _ sttycols
+               if {[string is integer -strict $sttycols]} {
+                       set cols $sttycols
+               }
        }
        incr cols -1
        # Now output
@@ -910,8 +913,7 @@ proc list-non-empty {list} {
 # Searches the path for an executable with the given name.
 # Note that the name may include some parameters, e.g. 'cc -mbig-endian',
 # in which case the parameters are ignored.
-# The full path to the executable if found, or "" if not found.
-# Returns 1 if found, or 0 if not.
+# Returns the full path to the executable if found, or "" if not found.
 #
 proc find-executable-path {name} {
        # Ignore any parameters

diff --git a/autosetup/cc.tcl b/autosetup/cc.tcl
index f45cc2ecdce3a9cb3ddb6bdc57947724231d0885..5e724d9b78b39ba70bf5b83bc737de15071cea07 100644 (file)
--- a/autosetup/cc.tcl
+++ b/autosetup/cc.tcl
@@ -5,7 +5,7 @@
 #
 # The 'cc' module supports checking various 'features' of the C or C++
 # compiler/linker environment. Common commands are 'cc-check-includes',
-# 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'.
+# 'cc-check-types', 'cc-check-functions', 'cc-with' and 'make-config-header'
 #
 # The following environment variables are used if set:
 #

diff --git a/manifest b/manifest
index df35a34bbf38f24ddeb15a5e4e00bdd058129459..5dd40c0b4e62b998197765830665645c16426523 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\sinto\sautosetup\sbranch\sfor\slatest\swasm\spieces.
-D 2024-09-28T00:37:23.852
+C Latest\supstream\sautosetup\sfor\sa\s--help\sfix\son\sQNX.
+D 2024-09-28T00:41:34.737
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -36,7 +36,7 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc 7b3bb2ef32ade0f3f14d951231811678722725e3bca240dd9727ae0dfe10f6a5
 F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
 F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e
-F autosetup/autosetup 7d7fe206980a6d04113f85e570229953f7e0cd5ef31bb40868653b976f8698af x
+F autosetup/autosetup 9416ffdcdd6e2dbf7f6d1e5c890078518930f8af7722a950eacc28c7f151d2d6 x
 F autosetup/autosetup-config.guess dfa101c5e8220e864d5e9c72a85e87110df60260d36cb951ad0a85d6d9eaa463 x
 F autosetup/autosetup-config.sub a38fb074d0dece01cf919e9fb534a26011608aa8fa606490864295328526cd73 x
 F autosetup/autosetup-find-tclsh c5053419348cdd1aba824c3701bd97392d987b948c1bd748b32f11bbca2c0d8a x
@@ -44,7 +44,7 @@ F autosetup/autosetup-test-tclsh 749d20defee533a3842139df47d700fc7a334a5da7bdbd4
 F autosetup/cc-db.tcl 6e0ed90146197a5a05b245e649975c07c548e30926b218ca3e1d4dc034b10a7b
 F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795facf7360
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
-F autosetup/cc.tcl 1b52de228642c1db5a714d54ca974d723ec8b4092e8c3765d348b625850f7311
+F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
 F autosetup/hwaci-common.tcl bd3321e80b92eb0644be4f05df44d5c98ab415b2c7dc10866303dfe5ba77592a
 F autosetup/jimsh0.c 1b5fe91fffcddbc29f2b16acb80f1650632ea2edbe8336b8155ef7b4c66f6d8d
@@ -631,7 +631,7 @@ F ext/wasm/SQLTester/SQLTester.run.mjs c72b7fe2072d05992f7a3d8c6a1d34e95712513ce
 F ext/wasm/SQLTester/index.html 3f8a016df0776be76605abf20e815ecaafbe055abac0e1fe5ea080e7846b760d
 F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-core 2bcbbfe3b95c043ed6037e2708a2ee078d212dd1612c364f93588d8dc97300fe
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras fe40d6d758646e38f8b15f709044951e10884214f5453d35502100179c388c13 w ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-session
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras fe40d6d758646e38f8b15f709044951e10884214f5453d35502100179c388c13
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 34fe11466f9c1d81b10a0469e1114e5f1c5a6365c73d80a1a6ca639a1a358b73
@@ -2233,8 +2233,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9586ea204c705430d63e3757f80009a152b89573a75c6862e407062be8ef346c 208c27714646c9bc26eef11266086a71da04bc24e87078de0955e7beb68a821e
-R 1ef986af17c4e886df6e4f496b132523
+P c3877d1241f946b470a7a4868f13e1106e8aac4851d4bc5a64c90e0569444b81
+R c95c554af644d55a7c83b59eb1349814
 U stephan
-Z f102d1cc9aacb9d174c9700a0adefb05
+Z d6501046de47ed3c7029a05bf2997e84
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index eb97aee2c0cea5f6a4c017bd3a24147e2b903964..eccaa510815ec7472010a2f965edd830f547f89c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3877d1241f946b470a7a4868f13e1106e8aac4851d4bc5a64c90e0569444b81
+b9faebbb543fb3a03f46dd4defe28ffa0c32a9a46ed73912f93b86e41f3db04a