merge revision(s) 39842: [Backport #8130]

	* lib/mkmf.rb (find_library): fix to format message.
	  [ruby-core:53568] [Bug #8130]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 08ae492b11..1d9405e3fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 12 03:48:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (find_library): fix to format message.
+	  [ruby-core:53568] [Bug #8130]
+
 Fri Apr 12 03:44:45 2013  Narihiro Nakamura  <authornari@gmail.com>
 
 	* proc.c (bm_free): need to clean up the mark flag of a free and
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 70177562ed..c0ede35474 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -966,7 +966,7 @@ SRC
     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
diff --git a/version.h b/version.h
index ceb609ca0c..3e12e72f7d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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