kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-01-28 04:07:06 +00:00
parent 693a26ac74
commit 0dfc492dd2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> Wed Jan 28 12:43:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rss: rss library imported. [ruby-dev:22726] * lib/rss: rss library imported. [ruby-dev:22726]

4
ext/iconv/extconf.rb
View file

@ -6,7 +6,7 @@ conf = File.exist?(File.join($srcdir, "config.charset"))
conf = with_config("config-charset", enable_config("config-charset", conf)) conf = with_config("config-charset", enable_config("config-charset", conf))
if have_header("iconv.h") 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(' !try_compile('
#include <iconv.h> #include <iconv.h>
size_t size_t
@ -20,7 +20,7 @@ test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen)
else else
$defs.push('-DICONV_INPTR_CAST="(char **)"') $defs.push('-DICONV_INPTR_CAST="(char **)"')
end end
have_library("iconv", "iconv") have_library("iconv", "iconv") {|s| s.sub(/(?=\n\/\*top\*\/)/, "#include <iconv.h>")}
if conf if conf
prefix = '$(srcdir)' prefix = '$(srcdir)'
prefix = $nmake ? "{#{prefix}}" : "#{prefix}/" prefix = $nmake ? "{#{prefix}}" : "#{prefix}/"