summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 15:38:51 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 15:38:51 +0000
commit6e6adcca4b009ccab637b31784b6f2626b9c8ae6 (patch)
treecd7125672e7405db310114218324d633dfe6f92c /ext
parentb7220edcf431a87c9e78d34968e904d58a6dad9d (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/curses/extconf.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 799d1bfe5f..a8374a86fd 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -8,7 +8,7 @@ make=false
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