nagachika	2013-04-12 04:07:49 +0900 (Fri, 12 Apr 2013)

  New Revision: 40255

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40255

  Log:
    merge revision(s) 39842: [Backport #8130]
    
    * lib/mkmf.rb (find_library): fix to format message.
      [ruby-core:53568] [Bug #8130]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40254)
+++ ruby_2_0_0/ChangeLog	(revision 40255)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Apr 12 03:48:25 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (find_library): fix to format message.
+	  [ruby-core:53568] [Bug #8130]
+
 Fri Apr 12 03:44:45 2013  Narihiro Nakamura  <authornari@g...>
 
 	* proc.c (bm_free): need to clean up the mark flag of a free and
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 40254)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 40255)
@@ -966,7 +966,7 @@ SRC https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L966
     func = "main" if !func or func.empty?
     lib = with_config(lib+'lib', lib)
     paths = paths.collect {|path| path.split(File::PATH_SEPARATOR)}.flatten
-    checking_for(func.funcall_style, LIBARG%lib) do
+    checking_for checking_message(func.funcall_style, LIBARG%lib) do
       libpath = $LIBPATH
       libs = append_library($libs, lib)
       begin
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40254)
+++ ruby_2_0_0/version.h	(revision 40255)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-12"
-#define RUBY_PATCHLEVEL 116
+#define RUBY_PATCHLEVEL 117
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39842


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/