diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-28 04:07:06 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-28 04:07:06 +0000 |
| commit | 1b7cf58ff1207352cdcc8ffa66c0071f9021a634 (patch) | |
| tree | 10ec180afe69cb65f2c4c89688449c1bbdc1bc39 | |
| parent | 1e3e420f3788bbabc74e9f5e5473781772078e1d (diff) | |
| download | ruby-1b7cf58ff1207352cdcc8ffa66c0071f9021a634.tar.gz ruby-1b7cf58ff1207352cdcc8ffa66c0071f9021a634.tar.xz ruby-1b7cf58ff1207352cdcc8ffa66c0071f9021a634.zip | |
* ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5568 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 @@ +Wed Jan 28 13:07:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715] + Wed Jan 28 12:43:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/rss: rss library imported. [ruby-dev:22726] diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 73174a17f..9e6c266bc 100644 --- a/ext/iconv/extconf.rb +++ b/ext/iconv/extconf.rb @@ -6,7 +6,7 @@ conf = File.exist?(File.join($srcdir, "config.charset")) conf = with_config("config-charset", enable_config("config-charset", conf)) if have_header("iconv.h") - if !try_compile("", "-Werror") or checking_for("iconv() 2nd argument is const") do + if !try_compile("", "-Werror") or checking_for("const of iconv() 2nd argument") do !try_compile(' #include <iconv.h> size_t @@ -20,7 +20,7 @@ test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen) else $defs.push('-DICONV_INPTR_CAST="(char **)"') end - have_library("iconv", "iconv") + have_library("iconv", "iconv") {|s| s.sub(/(?=\n\/\*top\*\/)/, "#include <iconv.h>")} if conf prefix = '$(srcdir)' prefix = $nmake ? "{#{prefix}}" : "#{prefix}/" |