From c6defbf3108a0cd1d16184dafe5fba9e2542cf39 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 26 Aug 2009 08:00:37 +0000
Subject: [PATCH] * tool/mkconfig.rb (program_transform_name): fix for autoconf
 2.61   or earlier.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        | 5 +++++
 tool/mkconfig.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97a45b3478..b0e553ac2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 a66a20f3e8..0c16df8e03 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