summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/fiddle/extconf.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 1adbc11eca..37bbfdc247 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -2,7 +2,8 @@ require 'mkmf'
# :stopdoc:
-if ! enable_config('bundled-libffi', false)
+bundle = enable_config('bundled-libffi')
+if ! bundle
dir_config 'libffi'
pkg_config("libffi") and
@@ -16,7 +17,8 @@ if ! enable_config('bundled-libffi', false)
end and (have_library('ffi') || have_library('libffi'))
end or
begin
- ver = Dir.glob("#{$srcdir}/libffi-*/")
+ ver = bundle != false &&
+ Dir.glob("#{$srcdir}/libffi-*/")
.map {|n| File.basename(n)}
.max_by {|n| n.scan(/\d+/).map(&:to_i)}
unless ver