diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-26 08:00:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-26 08:00:37 +0000 |
| commit | 864d8137440bab94f8e3c081fe102d31d12e43d4 (patch) | |
| tree | 893e0db71bccf606085f6a72060a934e4c4b5e73 | |
| parent | 80d6510a1a2da53a65d83652699d4b21e12b6531 (diff) | |
| download | ruby-864d8137440bab94f8e3c081fe102d31d12e43d4.tar.gz ruby-864d8137440bab94f8e3c081fe102d31d12e43d4.tar.xz ruby-864d8137440bab94f8e3c081fe102d31d12e43d4.zip | |
* tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
or earlier.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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> * lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index a66a20f3e..0c16df8e0 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -84,7 +84,7 @@ File.foreach "config.status" do |line| 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 @@ File.foreach "config.status" do |line| 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 |