* ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.

* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
  uniformly.  [ruby-dev:24118]


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

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e05bf733b8..e869fc9ca2 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -20,6 +20,7 @@ unless defined? $configure_args
   for arg in Shellwords::shellwords(args)
     arg, val = arg.split('=', 2)
     next unless arg
+    arg.tr!('_', '-')
     if arg.sub!(/^(?!--)/, '--')
       val or next
       arg.downcase!
@@ -30,6 +31,7 @@ unless defined? $configure_args
   for arg in ARGV
     arg, val = arg.split('=', 2)
     next unless arg
+    arg.tr!('_', '-')
     if arg.sub!(/^(?!--)/, '--')
       val or next
       arg.downcase!
@@ -623,11 +625,11 @@ def find_executable(bin, path = nil)
 end
 
 def arg_config(config, default=nil)
-  $configure_args.fetch(config, default)
+  $configure_args.fetch(config.tr('_', '-'), default)
 end
 
 def with_config(config, default=nil)
-  unless /^--with-/ =~ config
+  unless /^--with[-_]/ =~ config
     config = '--with-' + config
   end
   arg_config(config, default)