summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-22 05:16:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-22 05:16:30 +0000
commit5ca882ec08224705d5f1ba9c606318c018971a2b (patch)
tree9eb323bce3a760ccc8a633ff0fe60d8d0d743024
parentcff1d9dd2fa7fc2628b1ea62b5103a345737b10f (diff)
* ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
needs headers to detect some functions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/readline/extconf.rb22
2 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f6d917d7e6..7bd2801b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 22 14:16:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
+ needs headers to detect some functions.
+
Sun Jun 22 10:07:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (STRINGIZE, NO_STRING_LITERAL_CONCATENATION): added
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b820c0b32f..3f5c6474d6 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -15,6 +15,10 @@ def have_readline_var(var)
return have_var(var, $readline_headers)
end
+def have_readline_func(func)
+ return have_func(func, $readline_headers)
+end
+
dir_config('curses')
dir_config('ncurses')
dir_config('termcap')
@@ -42,9 +46,9 @@ else
end
end
-have_func("rl_filename_completion_function")
-have_func("rl_username_completion_function")
-have_func("rl_completion_matches")
+have_readline_func("rl_filename_completion_function")
+have_readline_func("rl_username_completion_function")
+have_readline_func("rl_completion_matches")
have_readline_var("rl_deprep_term_function")
have_readline_var("rl_completion_append_character")
have_readline_var("rl_basic_word_break_characters")
@@ -55,10 +59,10 @@ have_readline_var("rl_filename_quote_characters")
have_readline_var("rl_attempted_completion_over")
have_readline_var("rl_library_version")
have_readline_var("rl_event_hook")
-have_func("rl_cleanup_after_signal")
-have_func("rl_clear_signals")
-have_func("rl_vi_editing_mode")
-have_func("rl_emacs_editing_mode")
-have_func("replace_history_entry")
-have_func("remove_history")
+have_readline_func("rl_cleanup_after_signal")
+have_readline_func("rl_clear_signals")
+have_readline_func("rl_vi_editing_mode")
+have_readline_func("rl_emacs_editing_mode")
+have_readline_func("replace_history_entry")
+have_readline_func("remove_history")
create_makefile("readline")