merge revision(s) 54716,54719,54750: [Backport ruby#12314]

unak · unak · commit a29386aaabd3 · 2016-04-26T04:23:06.000Z
* configure.in: don't use the system-provided round(3) on AIX.
	  In AIX, round(0.49999999999999994) returns 1.0.
	  Use round() in numeric.c instead.

	* configure.in: add missing -lm for AIX.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: add missing -lm for AIX.
+
+Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: don't use the system-provided round(3) on AIX.
+	  In AIX, round(0.49999999999999994) returns 1.0.
+	  Use round() in numeric.c instead.
+
 Tue Apr 26 13:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c: cygwin does not use w32_cmdvector, command line can be
diff --git a/configure.in b/configure.in
@@ -1131,6 +1131,9 @@ main()
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		],
+[aix*],[	LIBS="-lm $LIBS"
+		ac_cv_func_round=no
+		],
 [nacl], [
   LIBS="-lm $LIBS"
   if test "${nacl_cv_build_variant}" = "newlib"; then
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 316
+#define RUBY_PATCHLEVEL 317
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
