Fossil SCM
Latest upstream autosetup for a --help fix on QNX.
Commit
742450caf4bf3b3ff0cf150d5e5d7dbdc495c65703b897156b0815778d691ed5
Parent
c20aa86727773e3…
2 files changed
+5
-3
+1
-1
+5
-3
| --- autosetup/autosetup | ||
| +++ autosetup/autosetup | ||
| @@ -564,11 +564,14 @@ | ||
| 564 | 564 | set max [max $max [string length $opt]] |
| 565 | 565 | } |
| 566 | 566 | set indent [string repeat " " [expr {$max+4}]] |
| 567 | 567 | set cols [getenv COLUMNS 80] |
| 568 | 568 | catch { |
| 569 | - lassign [exec stty size] rows cols | |
| 569 | + lassign [exec stty size] _ sttycols | |
| 570 | + if {[string is integer -strict $sttycols]} { | |
| 571 | + set cols $sttycols | |
| 572 | + } | |
| 570 | 573 | } |
| 571 | 574 | incr cols -1 |
| 572 | 575 | # Now output |
| 573 | 576 | foreach help $::autosetup(optionhelp) { |
| 574 | 577 | lassign $help opt module desc |
| @@ -908,12 +911,11 @@ | ||
| 908 | 911 | # @find-executable-path name |
| 909 | 912 | # |
| 910 | 913 | # Searches the path for an executable with the given name. |
| 911 | 914 | # Note that the name may include some parameters, e.g. 'cc -mbig-endian', |
| 912 | 915 | # in which case the parameters are ignored. |
| 913 | -# The full path to the executable if found, or "" if not found. | |
| 914 | -# Returns 1 if found, or 0 if not. | |
| 916 | +# Returns the full path to the executable if found, or "" if not found. | |
| 915 | 917 | # |
| 916 | 918 | proc find-executable-path {name} { |
| 917 | 919 | # Ignore any parameters |
| 918 | 920 | set name [lindex $name 0] |
| 919 | 921 | # The empty string is never a valid executable |
| 920 | 922 |
| --- autosetup/autosetup | |
| +++ autosetup/autosetup | |
| @@ -564,11 +564,14 @@ | |
| 564 | set max [max $max [string length $opt]] |
| 565 | } |
| 566 | set indent [string repeat " " [expr {$max+4}]] |
| 567 | set cols [getenv COLUMNS 80] |
| 568 | catch { |
| 569 | lassign [exec stty size] rows cols |
| 570 | } |
| 571 | incr cols -1 |
| 572 | # Now output |
| 573 | foreach help $::autosetup(optionhelp) { |
| 574 | lassign $help opt module desc |
| @@ -908,12 +911,11 @@ | |
| 908 | # @find-executable-path name |
| 909 | # |
| 910 | # Searches the path for an executable with the given name. |
| 911 | # Note that the name may include some parameters, e.g. 'cc -mbig-endian', |
| 912 | # in which case the parameters are ignored. |
| 913 | # The full path to the executable if found, or "" if not found. |
| 914 | # Returns 1 if found, or 0 if not. |
| 915 | # |
| 916 | proc find-executable-path {name} { |
| 917 | # Ignore any parameters |
| 918 | set name [lindex $name 0] |
| 919 | # The empty string is never a valid executable |
| 920 |
| --- autosetup/autosetup | |
| +++ autosetup/autosetup | |
| @@ -564,11 +564,14 @@ | |
| 564 | set max [max $max [string length $opt]] |
| 565 | } |
| 566 | set indent [string repeat " " [expr {$max+4}]] |
| 567 | set cols [getenv COLUMNS 80] |
| 568 | catch { |
| 569 | lassign [exec stty size] _ sttycols |
| 570 | if {[string is integer -strict $sttycols]} { |
| 571 | set cols $sttycols |
| 572 | } |
| 573 | } |
| 574 | incr cols -1 |
| 575 | # Now output |
| 576 | foreach help $::autosetup(optionhelp) { |
| 577 | lassign $help opt module desc |
| @@ -908,12 +911,11 @@ | |
| 911 | # @find-executable-path name |
| 912 | # |
| 913 | # Searches the path for an executable with the given name. |
| 914 | # Note that the name may include some parameters, e.g. 'cc -mbig-endian', |
| 915 | # in which case the parameters are ignored. |
| 916 | # Returns the full path to the executable if found, or "" if not found. |
| 917 | # |
| 918 | proc find-executable-path {name} { |
| 919 | # Ignore any parameters |
| 920 | set name [lindex $name 0] |
| 921 | # The empty string is never a valid executable |
| 922 |
+1
-1
| --- autosetup/cc.tcl | ||
| +++ autosetup/cc.tcl | ||
| @@ -3,11 +3,11 @@ | ||
| 3 | 3 | |
| 4 | 4 | # @synopsis: |
| 5 | 5 | # |
| 6 | 6 | # The 'cc' module supports checking various 'features' of the C or C++ |
| 7 | 7 | # compiler/linker environment. Common commands are 'cc-check-includes', |
| 8 | -# 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'. | |
| 8 | +# 'cc-check-types', 'cc-check-functions', 'cc-with' and 'make-config-header' | |
| 9 | 9 | # |
| 10 | 10 | # The following environment variables are used if set: |
| 11 | 11 | # |
| 12 | 12 | ## CC - C compiler |
| 13 | 13 | ## CXX - C++ compiler |
| 14 | 14 |
| --- autosetup/cc.tcl | |
| +++ autosetup/cc.tcl | |
| @@ -3,11 +3,11 @@ | |
| 3 | |
| 4 | # @synopsis: |
| 5 | # |
| 6 | # The 'cc' module supports checking various 'features' of the C or C++ |
| 7 | # compiler/linker environment. Common commands are 'cc-check-includes', |
| 8 | # 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'. |
| 9 | # |
| 10 | # The following environment variables are used if set: |
| 11 | # |
| 12 | ## CC - C compiler |
| 13 | ## CXX - C++ compiler |
| 14 |
| --- autosetup/cc.tcl | |
| +++ autosetup/cc.tcl | |
| @@ -3,11 +3,11 @@ | |
| 3 | |
| 4 | # @synopsis: |
| 5 | # |
| 6 | # The 'cc' module supports checking various 'features' of the C or C++ |
| 7 | # compiler/linker environment. Common commands are 'cc-check-includes', |
| 8 | # 'cc-check-types', 'cc-check-functions', 'cc-with' and 'make-config-header' |
| 9 | # |
| 10 | # The following environment variables are used if set: |
| 11 | # |
| 12 | ## CC - C compiler |
| 13 | ## CXX - C++ compiler |
| 14 |