Wed Feb 3 10:12:09 2010 Aaron Patterson <tenderlove@ruby-lang.org>

        * ext/dl/function.c: DL::Function now uses libffi

        * ext/dl/cfunc.c (rb_dl_set_last_error): set to non static so errors
          can be exposed.

        * ext/dl/closure.c: DL::Closure will now be used in place of
          ext/dl/callback/*.

        * ext/dl/dl.c: legacy callbacks removed in favor of libffi

        * ext/dl/dl_converions.(c,h): used for converting ruby types to FFI
          types.

        * ext/dl/callback/*: replaced by libffi callbacks.

        * ext/dl/lib/dl/callback.rb: Converting internal callbacks to use
          DL::Closure

        * ext/dl/lib/dl/closure.rb: Ruby parts of the new DL::Closure object

        * ext/dl/lib/dl/import.rb: More conversion to use DL::Closure object

        * ext/dl/lib/dl/value.rb (ruby2ffi): adding private method for
          DL::CPtr to ffi value conversion.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 22 insertions, 0 deletions

diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index 8317ac35ad..e2b7af6410 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -8,8 +8,30 @@ $INSTALLFILES = [
   ["dl.h", "$(HDRDIR)"],
 ]
 
+if pkg_config("libffi")
+  # libffi closure api must be switched depending on the version
+  if system("pkg-config --atleast-version=3.0.9 libffi")
+    $defs.push(format('-DUSE_NEW_CLOSURE_API'))
+  end
+else
+  dir_config('ffi', '/usr/include', '/usr/lib')
+end
+
+unless have_header('ffi.h')
+  if have_header('ffi/ffi.h')
+    $defs.push(format('-DUSE_HEADER_HACKS'))
+  else
+    abort "ffi is missing"
+  end
+end
+
+unless have_library('ffi')
+  abort "ffi is missing"
+end
+
 check = true
 if( have_header("dlfcn.h") )
+
   have_library("dl")
   check &&= have_func("dlopen")
   check &&= have_func("dlclose")