diff --git a/ChangeLog b/ChangeLog index b6ba4f4a71..ebf1e7d6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 21 13:16:31 2011 TAKAO Kouji + + * 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 * process.c (before_exec): use sig_do_nothing instead of SIG_DFL diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index 685da8c5bf..b8e9e0fab4 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -36,18 +36,21 @@ have_library("ncurses", "tgetnum") || 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") ||