diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-25 06:33:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-25 06:33:11 +0000 |
| commit | 9aa6a033d20be72e3b04c0a0ab8b999b50166ee8 (patch) | |
| tree | b15c057c2e8b0192796dd705202e3ca4cbb02c3c | |
| parent | be9dc49f1e4cd2a0ce1728651781d416fdc1b2d6 (diff) | |
| download | ruby-9aa6a033d20be72e3b04c0a0ab8b999b50166ee8.tar.gz | |
* ext/iconv/extconf.rb: check stricter. [ruby-talk:104501]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/iconv/extconf.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Jun 25 15:33:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/iconv/extconf.rb: check stricter. [ruby-talk:104501] + Fri Jun 25 01:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org> * {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 5e80188013..36f291c4a6 100644 --- a/ext/iconv/extconf.rb +++ b/ext/iconv/extconf.rb @@ -5,8 +5,8 @@ dir_config("iconv") conf = File.exist?(File.join($srcdir, "config.charset")) conf = with_config("config-charset", enable_config("config-charset", conf)) -if have_header("iconv.h") - have_library("iconv", "iconv") {|s| s.sub(/(?=\n\/\*top\*\/)/, "#include <iconv.h>")} +if have_func("iconv", "iconv.h") or + have_library("iconv", "iconv") {|s| s.sub(/(?=\n\/\*top\*\/)/, "#include <iconv.h>")} if checking_for("const of iconv() 2nd argument") do create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---") src = xpopen(cpp_command("")) {|f|f.read} |