1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61

Browse Source 
or earlier.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-26 08:00:37 +00:00
parent 0c86e8b70b
commit c6defbf310
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Aug 26 17:00:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
or earlier.
Wed Aug 26 14:34:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 26 14:34:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side * lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side

4
tool/mkconfig.rb
View File

@ -84,7 +84,7 @@ File.foreach "config.status" do |line|
when /^\$ac_\w+$/; next when /^\$ac_\w+$/; next
end end
if /^program_transform_name$/ =~ name if /^program_transform_name$/ =~ name
val.sub!(/\As(\W)(?:\^|\$\$)\1\1(;|\z)/, '') val.sub!(/\As(\\?\W)(?:\^|\${1,2})\1\1(;|\z)/, '')
if val.empty? if val.empty?
$install_name ||= "ruby" $install_name ||= "ruby"
next next
@ -92,7 +92,7 @@ File.foreach "config.status" do |line|
unless $install_name unless $install_name
$install_name = "ruby" $install_name = "ruby"
val.gsub!(/\$\$/, '$') val.gsub!(/\$\$/, '$')
val.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do val.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do
|addr, cmd, sep, pat, rep, opt| |addr, cmd, sep, pat, rep, opt|
if addr if addr
Regexp.new(addr[/\A\/(.*)\/\z/, 1]) =~ $install_name or next Regexp.new(addr[/\A\/(.*)\/\z/, 1]) =~ $install_name or next