ruby-changes:12927
From: nobu <ko1@a...>
Date: Wed, 26 Aug 2009 17:00:55 +0900 (JST)
Subject: [ruby-changes:12927] Ruby:r24665 (trunk): * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
nobu 2009-08-26 17:00:37 +0900 (Wed, 26 Aug 2009) New Revision: 24665 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24665 Log: * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61 or earlier. Modified files: trunk/ChangeLog trunk/tool/mkconfig.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 24664) +++ ChangeLog (revision 24665) @@ -1,3 +1,8 @@ +Wed Aug 26 17:00:31 2009 Nobuyoshi Nakada <nobu@r...> + + * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61 + or earlier. + Wed Aug 26 14:34:39 2009 Nobuyoshi Nakada <nobu@r...> * lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side Index: tool/mkconfig.rb =================================================================== --- tool/mkconfig.rb (revision 24664) +++ tool/mkconfig.rb (revision 24665) @@ -84,7 +84,7 @@ when /^\$ac_\w+$/; next end if /^program_transform_name$/ =~ name - val.sub!(/\As(\W)(?:\^|\$\$)\1\1(;|\z)/, '') + val.sub!(/\As(\\?\W)(?:\^|\${1,2})\1\1(;|\z)/, '') if val.empty? $install_name ||= "ruby" next @@ -92,7 +92,7 @@ unless $install_name $install_name = "ruby" 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| if addr Regexp.new(addr[/\A\/(.*)\/\z/, 1]) =~ $install_name or next -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/