diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-24 02:00:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-24 02:00:46 +0000 |
| commit | 5ee6b28538452941313f289cac7b25c8a4561f8d (patch) | |
| tree | 2042aa2eb1347c1ee38ba3fd2c61a1101980b99c /ext | |
| parent | 9694e07f555d3bd3c7d2a41777290fa9fc181d52 (diff) | |
merges r28327,r28329 and r28332 from trunk into ruby_1_9_2.
--
* ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
--
* ext/fiddle/extconf.rb: De Morgan's laws.
--
* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
On Debian/lenny, which is a "supported" platform, ffi.h is installed
in /usr/include/i486-linux-gnu/. This causes build error when using
gcc whose target is not i486-linux-gnu.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/fiddle/extconf.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index 87c5c9e633..dcc2c43cfd 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -4,6 +4,7 @@ require 'mkmf' dir_config 'libffi' +pkg_config("libffi") unless have_header('ffi.h') if have_header('ffi/ffi.h') $defs.push(format('-DUSE_HEADER_HACKS')) |