From 0dfc492dd263ff232dfd0438aa7a6ca39294e199 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 28 Jan 2004 04:07:06 +0000 Subject: [PATCH] * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/iconv/extconf.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfc2d6d73e..0625ce546f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 28 13:07:02 2004 Nobuyoshi Nakada + + * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715] + Wed Jan 28 12:43:07 2004 Yukihiro Matsumoto * lib/rss: rss library imported. [ruby-dev:22726] diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 73174a17f2..9e6c266bc7 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 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 ")} if conf prefix = '$(srcdir)' prefix = $nmake ? "{#{prefix}}" : "#{prefix}/"