зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
693a26ac74
Коммит
0dfc492dd2
|
@ -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]
|
||||
|
|
|
@ -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}/"
|
||||
|
|
Загрузка…
Ссылка в новой задаче