nagachika	2015-03-31 00:35:08 +0900 (Tue, 31 Mar 2015)

  New Revision: 50130

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

  Log:
    merge revision(s) r49192: [Backport #10716]
    
    * configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
      which causes a syntax error with autoconf 2.63.
      [ruby-core:67429] [Bug #10716]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 50129)
+++ ruby_2_1/configure.in	(revision 50130)
@@ -2062,7 +2062,7 @@ if test ${setjmp_prefix+set}; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2062
     if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp${setjmp_suffix} = no; then
 	AC_MSG_ERROR(${setjmp_prefix}setjmp${setjmp_suffix} is not available)
     fi
-elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]); }; then
+elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]) }; then
     setjmp_cast=`expr "$ac_cv_func___builtin_setjmp" : "yes with cast (\(.*\))"`
     setjmp_prefix=__builtin_
     setjmp_suffix=
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50129)
+++ ruby_2_1/ChangeLog	(revision 50130)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Mar 31 00:34:39 2015  Vit Ondruch  <vondruch@r...>
+
+	* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
+	  which causes a syntax error with autoconf 2.63.
+	  [ruby-core:67429] [Bug #10716]
+
 Tue Mar 31 00:32:04 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50129)
+++ ruby_2_1/version.h	(revision 50130)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-31"
-#define RUBY_PATCHLEVEL 325
+#define RUBY_PATCHLEVEL 326
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49192


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