[前][次][番号順一覧][スレッド一覧]

ruby-changes:9967

From: matz <ko1@a...>
Date: Wed, 14 Jan 2009 16:20:17 +0900 (JST)
Subject: [ruby-changes:9967] Ruby:r21508 (trunk): * ext/curses/extconf.rb: check ncursesw earlier than ncurses to

matz	2009-01-14 16:19:58 +0900 (Wed, 14 Jan 2009)

  New Revision: 21508

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

  Log:
    * 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:
    trunk/ChangeLog
    trunk/ext/curses/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21507)
+++ ChangeLog	(revision 21508)
@@ -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 14:42:30 2009  TAKANO Mitsuhiro (takano32)  <tak@n...>
 
 	* cont.c: fix prototype declare of register_stack_extend
Index: ext/curses/extconf.rb
===================================================================
--- ext/curses/extconf.rb	(revision 21507)
+++ ext/curses/extconf.rb	(revision 21508)
@@ -9,7 +9,7 @@
 
 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/

[前][次][番号順一覧][スレッド一覧]