mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1d110a14a4
commit
1daac53ce7
2 changed files with 10 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
Tue Jun 21 13:16:31 2011 TAKAO Kouji <kouji@takao7.net>
|
||||||
|
|
||||||
|
* 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@gmail.com>
|
Mon Jun 20 22:52:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||||
|
|
||||||
* process.c (before_exec): use sig_do_nothing instead of SIG_DFL
|
* process.c (before_exec): use sig_do_nothing instead of SIG_DFL
|
||||||
|
|
|
@ -36,18 +36,21 @@ have_library("ncurses", "tgetnum") ||
|
||||||
|
|
||||||
case enable_libedit
|
case enable_libedit
|
||||||
when true
|
when true
|
||||||
|
# --enable-libedit
|
||||||
unless (have_readline_header("editline/readline.h") ||
|
unless (have_readline_header("editline/readline.h") ||
|
||||||
have_readline_header("readline/readline.h")) &&
|
have_readline_header("readline/readline.h")) &&
|
||||||
have_library("edit", "readline")
|
have_library("edit", "readline")
|
||||||
exit
|
exit
|
||||||
end
|
end
|
||||||
when nil
|
when false
|
||||||
|
# --disable-libedit
|
||||||
unless ((have_readline_header("readline/readline.h") &&
|
unless ((have_readline_header("readline/readline.h") &&
|
||||||
have_readline_header("readline/history.h")) &&
|
have_readline_header("readline/history.h")) &&
|
||||||
have_library("readline", "readline"))
|
have_library("readline", "readline"))
|
||||||
exit
|
exit
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
# does not specify
|
||||||
unless ((have_readline_header("readline/readline.h") &&
|
unless ((have_readline_header("readline/readline.h") &&
|
||||||
have_readline_header("readline/history.h")) &&
|
have_readline_header("readline/history.h")) &&
|
||||||
(have_library("readline", "readline") ||
|
(have_library("readline", "readline") ||
|
||||||
|
|
Loading…
Reference in a new issue