diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-19 02:59:36 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-19 02:59:36 +0000 |
commit | b55129c3c544e37cf8d21e9f5c4ffdcb9b71eb73 (patch) | |
tree | bfb06d955d97e518c7d476fdb2f6d5c7732f6efe | |
parent | 9dd9feab8adb54e813a87205977962c61030e3eb (diff) |
merge revision(s) 49192: [Backport #10716]
* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
which causes a syntax error with autoconf 2.63.
[ruby-core:67429] [Bug #10716]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Jan 19 11:57:14 2015 Vit Ondruch <vondruch@redhat.com> + + * configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon + which causes a syntax error with autoconf 2.63. + [ruby-core:67429] [Bug #10716] + Mon Jan 19 11:44:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with diff --git a/configure.in b/configure.in index 375ef5533c..599a22ee2e 100644 --- a/configure.in +++ b/configure.in @@ -2306,7 +2306,7 @@ if test ${setjmp_prefix+set}; then 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= @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-01-19" -#define RUBY_PATCHLEVEL 28 +#define RUBY_PATCHLEVEL 29 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 |