* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when

  the running script is '-e one-liner' or '-' (stdin).
* ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for stub libs
* ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
  have a wrong parent class.
* ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
  TkWarning2 --> TkWarningObj (old names are changed to alias names)
* ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
  option and hashes for configuration
* ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the button name
* ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==> get_value()
  and value=(val) ==> set_value(val).
* ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
* ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
  TkOptionMenuButton = TkOptionMenubutton)
* ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
  event_generate) for Event object
* ext/tk/lib/tk/font.rb: configinfo returns proper types of values
* ext/tk/lib/tk.rb: bind methods accept subst_args + block
* ext/tk/lib/tk/canvas.rb: ditto
* ext/tk/lib/tk/canvastag.rb: ditto
* ext/tk/lib/tk/frame.rb: ditto
* ext/tk/lib/tk/text.rb: ditto
* ext/tk/lib/tk/texttag.rb: ditto
* ext/tk/lib/tk/toplevel.rb: ditto
* ext/tk/lib/tkextlib/*: ditto and bug fix


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 2 deletions

diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
index 8ec34f0214..0635eea9e0 100644
--- a/ext/tcltklib/extconf.rb
+++ b/ext/tcltklib/extconf.rb
@@ -41,7 +41,9 @@ def find_tcl(tcllib, stubs)
     true
   else
     %w[8.5 8.4 8.3 8.2 8.1 8.0 7.6].find { |ver|
-      find_library("tcl#{ver}", func, *paths) or
+      find_library("#{lib}#{ver}", func, *paths) or
+        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+        find_library("tcl#{ver}", func, *paths) or
         find_library("tcl#{ver.delete('.')}", func, *paths)
     }
   end
@@ -62,7 +64,9 @@ def find_tk(tklib, stubs)
     true
   else
     %w[8.5 8.4 8.3 8.2 8.1 8.0 4.2].find { |ver|
-      find_library("tk#{ver}", func, *paths) or
+      find_library("#{lib}#{ver}", func, *paths) or
+        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+        find_library("tk#{ver}", func, *paths) or
         find_library("tk#{ver.delete('.')}", func, *paths)
     }
   end