From 052fe512799c2aba7dc9171ebe4e2558b6b6db65 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Thu, 1 May 2014 16:49:00 +0900 Subject: Use header searcher to find readline and linenoise. --- mrbgems/mruby-bin-mirb/mrbgem.rake | 7 ++++++- mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'mrbgems') 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 #define MIRB_ADD_HISTORY(line) linenoiseHistoryAdd(line) -- cgit v1.2.3