diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-02 06:14:40 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-02 06:14:40 +0000 |
commit | 1745d2584a77306a349fc2209495aa6455763dc5 (patch) | |
tree | ea62e05f629e2b6690d4637ab8dc11d528384c2a | |
parent | f81b6694ed7d004054e0d11e6362769461af8905 (diff) |
merge revision(s) 52795: [Backport #11751]
* ext/readline/extconf.rb: call dir_config("libedit")
if --enable-libedit is spcified. [Bug #11751]
patched by John Hein
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/readline/extconf.rb | 1 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Dec 2 15:14:29 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/readline/extconf.rb: call dir_config("libedit") + if --enable-libedit is spcified. [Bug #11751] + patched by John Hein + Tue Dec 1 16:57:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_each_codepoint): raise an exception at incomplete diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index 8c3bffc26e..0095b61355 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -37,6 +37,7 @@ have_library("ncurses", "tgetnum") || case enable_libedit when true # --enable-libedit + dir_config("libedit") unless (readline.have_header("editline/readline.h") || readline.have_header("readline/readline.h")) && have_library("edit", "readline") @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.8" -#define RUBY_RELEASE_DATE "2015-12-01" -#define RUBY_PATCHLEVEL 430 +#define RUBY_RELEASE_DATE "2015-12-02" +#define RUBY_PATCHLEVEL 431 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" |