nagachika	2015-12-02 03:28:54 +0900 (Wed, 02 Dec 2015)

  New Revision: 52838

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

  Log:
    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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/readline/extconf.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52837)
+++ ruby_2_2/ChangeLog	(revision 52838)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Dec  2 03:17:01 2015  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* parse.y (parser_here_document): store dispatched result of
Index: ruby_2_2/ext/readline/extconf.rb
===================================================================
--- ruby_2_2/ext/readline/extconf.rb	(revision 52837)
+++ ruby_2_2/ext/readline/extconf.rb	(revision 52838)
@@ -37,6 +37,7 @@ have_library("ncurses", "tgetnum") || https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/readline/extconf.rb#L37
 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")
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52837)
+++ ruby_2_2/version.h	(revision 52838)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52795


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