nobu	2015-01-17 19:52:17 +0900 (Sat, 17 Jan 2015)

  New Revision: 49300

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49300

  Log:
    fiddle: --disable-bundled-libffi
    
    * ext/fiddle/extconf.rb: disable bundled libffi if explicitly
      disabled by --disable-bundled-libffi.

  Modified files:
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 49299)
+++ ext/fiddle/extconf.rb	(revision 49300)
@@ -2,7 +2,8 @@ require 'mkmf' https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L2
 
 # :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', fal https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L17
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/