naruse	2012-07-29 11:23:21 +0900 (Sun, 29 Jul 2012)

  New Revision: 36564

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

  Log:
    merge revision(s) 36455: [Backport #6772]
    
    * ext/curses/extconf.rb: support PDCurses.  patched by Luis Lavena.
      [ruby-core:46485] [Feature #6735]

  Modified files:
    branches/ruby_1_9_3/ext/curses/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ext/curses/extconf.rb
===================================================================
--- ruby_1_9_3/ext/curses/extconf.rb	(revision 36563)
+++ ruby_1_9_3/ext/curses/extconf.rb	(revision 36564)
@@ -16,7 +16,7 @@
 elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
   curses.unshift("varargs.h")
   make=true
-elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
+elsif have_header(*curses=%w"curses.h") and (have_library("curses", "initscr") || have_library("pdcurses", "initscr"))
   make=true
 end
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36563)
+++ ruby_1_9_3/version.h	(revision 36564)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 257
+#define RUBY_PATCHLEVEL 258
 
 #define RUBY_RELEASE_DATE "2012-07-29"
 #define RUBY_RELEASE_YEAR 2012

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