1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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_2@52838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-12-01 18:28:54 +00:00
parent 15cf93318a
commit 8458ff3a41
3 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Wed Dec 2 03:17:01 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
Wed Dec 2 02:59:42 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_here_document): store dispatched result of

View file

@ -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")

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-12-02"
#define RUBY_PATCHLEVEL 217
#define RUBY_PATCHLEVEL 218
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 12