mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ext/readline/extconf.rb: no global names
* ext/readline/extconf.rb (readline): get rid of polluting global namespace. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a60fe909d7
commit
ab9560c953
1 changed files with 54 additions and 54 deletions
|
@ -1,26 +1,26 @@
|
||||||
require "mkmf"
|
require "mkmf"
|
||||||
|
|
||||||
$readline_headers = ["stdio.h"]
|
readline = Struct.new(:headers, :extra_check).new(["stdio.h"])
|
||||||
|
|
||||||
def have_readline_header(header)
|
def readline.have_header(header)
|
||||||
if have_header(header, &$readline_extra_check)
|
if super(header, &extra_check)
|
||||||
$readline_headers.push(header)
|
headers.push(header)
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def have_readline_var(var)
|
def readline.have_var(var)
|
||||||
return have_var(var, $readline_headers)
|
return super(var, headers)
|
||||||
end
|
end
|
||||||
|
|
||||||
def have_readline_func(func)
|
def readline.have_func(func)
|
||||||
return have_func(func, $readline_headers)
|
return super(func, headers)
|
||||||
end
|
end
|
||||||
|
|
||||||
def have_readline_macro(macro)
|
def readline.have_macro(macro)
|
||||||
return have_macro(macro, $readline_headers)
|
return super(macro, headers)
|
||||||
end
|
end
|
||||||
|
|
||||||
dir_config('curses')
|
dir_config('curses')
|
||||||
|
@ -37,66 +37,66 @@ have_library("ncurses", "tgetnum") ||
|
||||||
case enable_libedit
|
case enable_libedit
|
||||||
when true
|
when true
|
||||||
# --enable-libedit
|
# --enable-libedit
|
||||||
unless (have_readline_header("editline/readline.h") ||
|
unless (readline.have_header("editline/readline.h") ||
|
||||||
have_readline_header("readline/readline.h")) &&
|
readline.have_header("readline/readline.h")) &&
|
||||||
have_library("edit", "readline")
|
have_library("edit", "readline")
|
||||||
raise "libedit not found"
|
raise "libedit not found"
|
||||||
end
|
end
|
||||||
when false
|
when false
|
||||||
# --disable-libedit
|
# --disable-libedit
|
||||||
unless ((have_readline_header("readline/readline.h") &&
|
unless ((readline.have_header("readline/readline.h") &&
|
||||||
have_readline_header("readline/history.h")) &&
|
readline.have_header("readline/history.h")) &&
|
||||||
have_library("readline", "readline"))
|
have_library("readline", "readline"))
|
||||||
raise "readline not found"
|
raise "readline not found"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
# does not specify
|
# does not specify
|
||||||
unless ((have_readline_header("readline/readline.h") &&
|
unless ((readline.have_header("readline/readline.h") &&
|
||||||
have_readline_header("readline/history.h")) &&
|
readline.have_header("readline/history.h")) &&
|
||||||
(have_library("readline", "readline") ||
|
(have_library("readline", "readline") ||
|
||||||
have_library("edit", "readline"))) ||
|
have_library("edit", "readline"))) ||
|
||||||
(have_readline_header("editline/readline.h") &&
|
(readline.have_header("editline/readline.h") &&
|
||||||
have_library("edit", "readline"))
|
have_library("edit", "readline"))
|
||||||
raise "readline nor libedit not found"
|
raise "readline nor libedit not found"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
have_readline_func("rl_getc")
|
readline.have_func("rl_getc")
|
||||||
have_readline_func("rl_getc_function")
|
readline.have_func("rl_getc_function")
|
||||||
have_readline_func("rl_filename_completion_function")
|
readline.have_func("rl_filename_completion_function")
|
||||||
have_readline_func("rl_username_completion_function")
|
readline.have_func("rl_username_completion_function")
|
||||||
have_readline_func("rl_completion_matches")
|
readline.have_func("rl_completion_matches")
|
||||||
have_readline_func("rl_refresh_line")
|
readline.have_func("rl_refresh_line")
|
||||||
have_readline_var("rl_deprep_term_function")
|
readline.have_var("rl_deprep_term_function")
|
||||||
have_readline_var("rl_completion_append_character")
|
readline.have_var("rl_completion_append_character")
|
||||||
have_readline_var("rl_basic_word_break_characters")
|
readline.have_var("rl_basic_word_break_characters")
|
||||||
have_readline_var("rl_completer_word_break_characters")
|
readline.have_var("rl_completer_word_break_characters")
|
||||||
have_readline_var("rl_basic_quote_characters")
|
readline.have_var("rl_basic_quote_characters")
|
||||||
have_readline_var("rl_completer_quote_characters")
|
readline.have_var("rl_completer_quote_characters")
|
||||||
have_readline_var("rl_filename_quote_characters")
|
readline.have_var("rl_filename_quote_characters")
|
||||||
have_readline_var("rl_attempted_completion_over")
|
readline.have_var("rl_attempted_completion_over")
|
||||||
have_readline_var("rl_library_version")
|
readline.have_var("rl_library_version")
|
||||||
have_readline_var("rl_editing_mode")
|
readline.have_var("rl_editing_mode")
|
||||||
have_readline_var("rl_line_buffer")
|
readline.have_var("rl_line_buffer")
|
||||||
have_readline_var("rl_point")
|
readline.have_var("rl_point")
|
||||||
# workaround for native windows.
|
# workaround for native windows.
|
||||||
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_event_hook")
|
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_event_hook")
|
||||||
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch")
|
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_sigwinch")
|
||||||
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals")
|
/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_signals")
|
||||||
have_readline_var("rl_pre_input_hook")
|
readline.have_var("rl_pre_input_hook")
|
||||||
have_readline_var("rl_special_prefixes")
|
readline.have_var("rl_special_prefixes")
|
||||||
have_readline_func("rl_cleanup_after_signal")
|
readline.have_func("rl_cleanup_after_signal")
|
||||||
have_readline_func("rl_free_line_state")
|
readline.have_func("rl_free_line_state")
|
||||||
have_readline_func("rl_clear_signals")
|
readline.have_func("rl_clear_signals")
|
||||||
have_readline_func("rl_set_screen_size")
|
readline.have_func("rl_set_screen_size")
|
||||||
have_readline_func("rl_get_screen_size")
|
readline.have_func("rl_get_screen_size")
|
||||||
have_readline_func("rl_vi_editing_mode")
|
readline.have_func("rl_vi_editing_mode")
|
||||||
have_readline_func("rl_emacs_editing_mode")
|
readline.have_func("rl_emacs_editing_mode")
|
||||||
have_readline_func("replace_history_entry")
|
readline.have_func("replace_history_entry")
|
||||||
have_readline_func("remove_history")
|
readline.have_func("remove_history")
|
||||||
have_readline_func("clear_history")
|
readline.have_func("clear_history")
|
||||||
have_readline_func("rl_redisplay")
|
readline.have_func("rl_redisplay")
|
||||||
have_readline_func("rl_insert_text")
|
readline.have_func("rl_insert_text")
|
||||||
have_readline_macro("RL_PROMPT_START_IGNORE")
|
readline.have_macro("RL_PROMPT_START_IGNORE")
|
||||||
have_readline_macro("RL_PROMPT_END_IGNORE")
|
readline.have_macro("RL_PROMPT_END_IGNORE")
|
||||||
create_makefile("readline")
|
create_makefile("readline")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue