diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-01 22:00:27 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-01 22:00:27 +0900 |
| commit | 41dbcf7a3ffa48faba27c57e917bbcde99fbf707 (patch) | |
| tree | 775bc959ca2cb0562aa9f78d7e11b9c24d667055 /mrbgems | |
| parent | c17761d5dd7a34569f8348138f78e90457fa019f (diff) | |
| parent | 052fe512799c2aba7dc9171ebe4e2558b6b6db65 (diff) | |
| download | mruby-41dbcf7a3ffa48faba27c57e917bbcde99fbf707.tar.gz mruby-41dbcf7a3ffa48faba27c57e917bbcde99fbf707.zip | |
Merge pull request #2165 from take-cheeze/header_searcher
Implement header searcher to use readline in mirb if possible.
Diffstat (limited to 'mrbgems')
| -rw-r--r-- | mrbgems/mruby-bin-mirb/mrbgem.rake | 7 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mrbgems/mruby-bin-mirb/mrbgem.rake b/mrbgems/mruby-bin-mirb/mrbgem.rake index ffef67a39..4c9cdf29e 100644 --- a/mrbgems/mruby-bin-mirb/mrbgem.rake +++ b/mrbgems/mruby-bin-mirb/mrbgem.rake @@ -3,7 +3,12 @@ MRuby::Gem::Specification.new('mruby-bin-mirb') do |spec| spec.author = 'mruby developers' spec.summary = 'mirb command' - spec.linker.libraries << 'readline' if spec.cc.defines.include? "ENABLE_READLINE" + if spec.build.cc.search_header_path 'readline/readline.h' + spec.cc.defines << "ENABLE_READLINE" + spec.linker.libraries << 'readline' + elsif spec.build.cc.search_header_path 'linenoise.h' + spec.cc.defines << "ENABLE_LINENOISE" + end spec.bins = %w(mirb) end diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index 62f9e62fe..e7bc69495 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -22,7 +22,7 @@ #define MIRB_WRITE_HISTORY(path) write_history(path) #define MIRB_READ_HISTORY(path) read_history(path) #define MIRB_USING_HISTORY() using_history() -#elif ENABLE_LINENOISE +#elif defined(ENABLE_LINENOISE) #define ENABLE_READLINE #include <linenoise.h> #define MIRB_ADD_HISTORY(line) linenoiseHistoryAdd(line) |