summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2013-11-15 18:35:32 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2013-11-15 18:35:32 -0800
commit19ca695c6c38a7e934ff48f68ffcf821930af8d7 (patch)
treefbfefe71d2816eda50d06f9c5f79f43c808f3cc6 /ext
parentff4b884bbaf012275ec8864221ca374726541153 (diff)
downloadffi-yajl-19ca695c6c38a7e934ff48f68ffcf821930af8d7.tar.gz
jruby hate mkmf, always install bundled libyajl2 on jruby
Diffstat (limited to 'ext')
-rw-r--r--ext/libyajl2/extconf.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/libyajl2/extconf.rb b/ext/libyajl2/extconf.rb
index 5119aa3..a449001 100644
--- a/ext/libyajl2/extconf.rb
+++ b/ext/libyajl2/extconf.rb
@@ -23,6 +23,12 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
# yajl_complete_parse is only in >= 2.0
libyajl2_ok = have_library("yajl", "yajl_complete_parse", [ "yajl/yajl_parse.h" ])
+ create_makefile("dummy")
+
+else
+ libyajl2_ok = false
+end
+
prefix=File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
unless libyajl2_ok
@@ -34,9 +40,6 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
Dir.chdir ".."
end
- create_makefile("dummy")
-
-end
File.open("Makefile", "w") do |mf|
mf.puts "# Dummy makefile for non-mri rubies"