diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-19 15:11:04 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-19 15:11:04 (GMT) |
commit | e8b55fb7335f4091d28524a6ee6266bcc6c2e87d (patch) | |
tree | bbdeb9381124f7f6138da32a26d2c8db37480399 /tools | |
parent | 8e1f957a669b2f4b84dca7e8a27f2985c0625172 (diff) | |
parent | 17e7dbc31ae557458ad1179bf72e38a1f71b61b2 (diff) | |
download | tcl-e8b55fb7335f4091d28524a6ee6266bcc6c2e87d.zip tcl-e8b55fb7335f4091d28524a6ee6266bcc6c2e87d.tar.gz tcl-e8b55fb7335f4091d28524a6ee6266bcc6c2e87d.tar.bz2 |
Allow tools/tcltk-man2html.tcl to work with both configure.in and configure.ac: It could be used in extensions which still use an older autoconf
Diffstat (limited to 'tools')
-rw-r--r--[-rwxr-xr-x] | tools/tcltk-man2html.tcl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index c81acce..c443af9 100755..100644 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -4,7 +4,7 @@ if {[catch {package require Tcl 8.6-} msg]} { puts stderr "ERROR: $msg" puts stderr "If running this script from 'make html', set the\ NATIVE_TCLSH environment\nvariable to point to an installed\ - tclsh8.7 (or the equivalent tclsh87.exe\non Windows)." + tclsh8.6 (or the equivalent tclsh86.exe\non Windows)." exit 1 } @@ -741,7 +741,11 @@ try { # ... but try to extract (name, version) from subdir contents try { - set f [open [file join $pkgsDir $dir configure.ac]] + try { + set f [open [file join $pkgsDir $dir configure.in]] + } trap {POSIX ENOENT} {} { + set f [open [file join $pkgsDir $dir configure.ac]] + } foreach line [split [read $f] \n] { if {2 == [scan $line \ { AC_INIT ( [%[^]]] , [%[^]]] ) } n v]} { |