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

* ext/readline/extconf.rb: reject GPLv3 readline. [ruby-dev:39172]

[ruby-core:25272] [ruby-dev:39167] [ruby-core:28736]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-05-31 18:48:16 +00:00
parent 508e987ac6
commit b64083376e
2 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Tue Jun 1 03:46:08 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/extconf.rb: reject GPLv3 readline. [ruby-dev:39172]
[ruby-core:25272] [ruby-dev:39167] [ruby-core:28736]
Tue Jun 1 01:14:31 2010 Masaya Tarui <tarui@ruby-lnag.org>
* io.c (pipe_open): add RB_GC_GUARD.

View file

@ -3,7 +3,7 @@ require "mkmf"
$readline_headers = ["stdio.h"]
def have_readline_header(header)
if have_header(header)
if have_header(header, &$readline_extra_check)
$readline_headers.push(header)
return true
else
@ -24,6 +24,12 @@ dir_config('ncurses')
dir_config('termcap')
dir_config("readline")
enable_libedit = enable_config("libedit")
$readline_extra_check = (proc {|src| src << <<EOS} unless enable_config("readline-v6"))
#if RL_VERSION_MAJOR >= 6
#error GPLv2 incompatible
#endif
EOS
have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM
have_library("ncurses", "tgetnum") ||
have_library("termcap", "tgetnum") ||