From 8458ff3a414b235b782ec4f1e3e4637774c6d16b Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 1 Dec 2015 18:28:54 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ ext/readline/extconf.rb | 1 + version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 76d9d5d951..c16220af01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 2 03:17:01 2015 NARUSE, Yui + + * 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 * parse.y (parser_here_document): store dispatched result of diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index c79370bf4c..5cbcc0ef7d 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") diff --git a/version.h b/version.h index c022b90445..1e34351196 100644 --- a/version.h +++ b/version.h @@ -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