From b64083376ef9fdd04ea48d7b4002934ab4f921b9 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 31 May 2010 18:48:16 +0000 Subject: * 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 --- ChangeLog | 5 +++++ ext/readline/extconf.rb | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 750d624142..05853f4cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 1 03:46:08 2010 NARUSE, Yui + + * 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 * io.c (pipe_open): add RB_GC_GUARD. diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index 14c2099b6d..4ddc763d11 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -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 << <= 6 +#error GPLv2 incompatible +#endif +EOS + have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM have_library("ncurses", "tgetnum") || have_library("termcap", "tgetnum") || -- cgit v1.2.3