naruse	2010-06-01 03:48:16 +0900 (Tue, 01 Jun 2010)

  New Revision: 28118

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28118

  Log:
    * ext/readline/extconf.rb: reject GPLv3 readline. [ruby-dev:39172]
      [ruby-core:25272] [ruby-dev:39167] [ruby-core:28736]

  Modified files:
    trunk/ChangeLog
    trunk/ext/readline/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28117)
+++ ChangeLog	(revision 28118)
@@ -1,3 +1,8 @@
+Tue Jun  1 03:46:08 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* io.c (pipe_open): add RB_GC_GUARD.
Index: ext/readline/extconf.rb
===================================================================
--- ext/readline/extconf.rb	(revision 28117)
+++ ext/readline/extconf.rb	(revision 28118)
@@ -3,7 +3,7 @@
 $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('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") ||

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/