Sync with Tcl version of tcl.m4
rebase