yugui	2009-01-16 00:38:51 +0900 (Fri, 16 Jan 2009)

  New Revision: 21559

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

  Log:
    merges r21508 from trunk into ruby_1_9_1.
    * ext/curses/extconf.rb: check ncursesw earlier than ncurses to
      support UTF-8 strings.   non UTF-8 strings should be converted
      explicitly.   [ruby-core:21094]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/curses/extconf.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21558)
+++ ruby_1_9_1/ChangeLog	(revision 21559)
@@ -1,3 +1,9 @@
+Wed Jan 14 16:16:19 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/curses/extconf.rb: check ncursesw earlier than ncurses to
+	  support UTF-8 strings.   non UTF-8 strings should be converted
+	  explicitly.   [ruby-core:21094]
+
 Wed Jan 14 13:09:00 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/extconf.rb (gai_strerror): checks if available and if
Index: ruby_1_9_1/ext/curses/extconf.rb
===================================================================
--- ruby_1_9_1/ext/curses/extconf.rb	(revision 21558)
+++ ruby_1_9_1/ext/curses/extconf.rb	(revision 21559)
@@ -8,7 +8,7 @@
 headers = []
 have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
 have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
-if have_header(*curses=%w"ncurses.h") and have_library("ncurses", "initscr")
+if have_header(*curses=%w"ncurses.h") and (have_library("ncursesw", "initscr") or have_library("ncurses", "initscr"))
   make=true
 elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
   make=true

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