ruby-changes:20131
From: kouji <ko1@a...>
Date: Tue, 21 Jun 2011 13:20:44 +0900 (JST)
Subject: [ruby-changes:20131] kouji:r32179 (trunk): * ext/readline/extconf.rb: fixed bug, specify --disable-libedit
kouji 2011-06-21 13:20:33 +0900 (Tue, 21 Jun 2011) New Revision: 32179 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32179 Log: * ext/readline/extconf.rb: fixed bug, specify --disable-libedit then disable libedit, does not specify then check readline and libedit if failed checking readline. (fixes #3375) Modified files: trunk/ChangeLog trunk/ext/readline/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 32178) +++ ChangeLog (revision 32179) @@ -1,3 +1,9 @@ +Tue Jun 21 13:16:31 2011 TAKAO Kouji <kouji@t...> + + * ext/readline/extconf.rb: fixed bug, specify --disable-libedit + then disable libedit, does not specify then check readline and + libedit if failed checking readline. (fixes #3375) + Mon Jun 20 22:52:07 2011 KOSAKI Motohiro <kosaki.motohiro@g...> * process.c (before_exec): use sig_do_nothing instead of SIG_DFL Index: ext/readline/extconf.rb =================================================================== --- ext/readline/extconf.rb (revision 32178) +++ ext/readline/extconf.rb (revision 32179) @@ -36,18 +36,21 @@ case enable_libedit when true + # --enable-libedit unless (have_readline_header("editline/readline.h") || have_readline_header("readline/readline.h")) && have_library("edit", "readline") exit end -when nil +when false + # --disable-libedit unless ((have_readline_header("readline/readline.h") && have_readline_header("readline/history.h")) && have_library("readline", "readline")) exit end else + # does not specify unless ((have_readline_header("readline/readline.h") && have_readline_header("readline/history.h")) && (have_library("readline", "readline") || -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/